include toplevel-version.make after config.make.

diff --git a/ChangeLog b/ChangeLog
index 00fceee530f82d8c66f89bde3c89d5802186090e..a4937f7b315ba5c259f6aa97c9eba1e98657340a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-11-13  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * make/stepmake.make: include toplevel-version.make after config.make.
+
        * stepmake/aclocal.m4 (depth): make sure $srcdir is absolute.
        also allow python2.4
 

diff --git a/make/stepmake.make b/make/stepmake.make
index 6ca2126168d234aaf06abc6bb1619b0cf0bbed26..2757da6a507a19eeb6274091441e818599e83012 100644 (file)
--- a/make/stepmake.make
+++ b/make/stepmake.make
@@ -34,9 +34,6 @@ scons:
 endif
 endif
 
-include $(depth)/make/toplevel-version.make
-MICRO_VERSION=$(PATCH_LEVEL)
-BUILD_VERSION=1
 
 # Use alternate configurations alongside eachother:
 #
@@ -71,6 +68,11 @@ outroot=.
 
 include $(config_make)
 
+include $(depth)/make/toplevel-version.make
+MICRO_VERSION=$(PATCH_LEVEL)
+BUILD_VERSION=1
+
+
 outdir=$(outroot)/$(outbase)
 
 # why not generic ??