From 89adc459d0384b2e6041c0b947f614ba2b61622a Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 13 Nov 2005 18:04:54 +0000 Subject: [PATCH] include toplevel-version.make after config.make. --- ChangeLog | 2 ++ make/stepmake.make | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 00fceee530..a4937f7b31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2005-11-13 Han-Wen Nienhuys + * 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 6ca2126168..2757da6a50 100644 --- 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 ?? -- 2.39.2