Merging upstream version 256.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 4 insertions, 5 deletions

diff --git a/tools/meson-render-jinja2.py b/tools/meson-render-jinja2.py
index 3a3d912..977de79 100755
--- a/tools/meson-render-jinja2.py
+++ b/tools/meson-render-jinja2.py
@@ -33,12 +33,11 @@ def render(filename, defines):
 
 def main():
     defines = parse_config_h(sys.argv[1])
-    defines.update(parse_config_h(sys.argv[2]))
-    output = render(sys.argv[3], defines)
-    with open(sys.argv[4], 'w') as f:
+    output = render(sys.argv[2], defines)
+    with open(sys.argv[3], 'w') as f:
         f.write(output)
-    info = os.stat(sys.argv[3])
-    os.chmod(sys.argv[4], info.st_mode)
+    info = os.stat(sys.argv[2])
+    os.chmod(sys.argv[3], info.st_mode)
 
 if __name__ == '__main__':
     main()