Move the amalgamation generation to later in the build process so

build.h exists. Otherwise an amalg build with a clean working dir
will fail because build.h is not found. Github issue 57.

1 files changed, 3 insertions, 3 deletions

diff --git a/configure.py b/configure.py
index 072dc37f5..0e2c94f82 100755
--- a/configure.py
+++ b/configure.py
@@ -1994,9 +1994,6 @@ def main(argv = None):
     build_config.public_headers.append(
         os.path.join(build_config.build_dir, 'build.h'))
 
-    if options.gen_amalgamation:
-        generate_amalgamation(build_config, options)
-
     template_vars = create_template_vars(build_config, options,
                                          modules_to_use,
                                          cc,
@@ -2006,6 +2003,9 @@ def main(argv = None):
     # Performs the I/O
     setup_build(build_config, options, template_vars)
 
+    if options.gen_amalgamation:
+        generate_amalgamation(build_config, options)
+
     def release_date(datestamp):
         if datestamp == 0:
             return 'undated'