* stepmake/aclocal.m4:

* make/stepmake.make:
* make/toplevel-version.make: Revert/fix VERSION/PACKAGE stuff.

diff --git a/ChangeLog b/ChangeLog
index 6d85123ef6baac6d02f09e865303aa915175c6b1..52ae0efd06172f4d21eceb2c6b274edc58b4088f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-22  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * stepmake/aclocal.m4: 
+       * make/stepmake.make:
+       * make/toplevel-version.make: Revert/fix VERSION/PACKAGE stuff.
+
 2003-09-22  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * scm/define-grob-properties.scm (gap-count): add gap-count

diff --git a/make/stepmake.make b/make/stepmake.make
index c73d4451be3c63af75059d0a5c30aeb47e60d480..dee7d048351c3dd8bbd3c5ca873866f1c4831d92 100644 (file)
--- a/make/stepmake.make
+++ b/make/stepmake.make
@@ -1,6 +1,7 @@
 # make/Stepmake.make
 
 include $(depth)/make/toplevel-version.make
+
 # Use alternate configurations alongside eachother:
 #
 #     ./configure --enable-config=debug
@@ -40,7 +41,6 @@ else
   outroot=$(builddir)/$(patsubst $(shell cd $(depth); pwd)%,%,$(pwd))
 endif
 
-include $(depth)/VERSION
 include $(config_make)
 
 outdir=$(outroot)/$(outbase)

diff --git a/make/toplevel-version.make b/make/toplevel-version.make
index 37d7e5a2ce5c2eaaf09dfe1d420fb6bf86b6f159..f657bfecee6597e2bde37f3020e2b84c79ef0ab8 100644 (file)
--- a/make/toplevel-version.make
+++ b/make/toplevel-version.make
@@ -1,5 +1,6 @@
 # Toplevel_version.make
 
+include $(depth)/VERSION
 TOPLEVEL_MAJOR_VERSION=$(MAJOR_VERSION)
 TOPLEVEL_MINOR_VERSION=$(MINOR_VERSION)
 TOPLEVEL_PATCH_LEVEL=$(PATCH_LEVEL)

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 4fb45c386a862f60227592c83708fc42275c3ac4..086c69befc54912cfa645ef8c86ccd6e64d94ba6 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -510,6 +510,7 @@ AC_DEFUN(STEPMAKE_GXX, [
 AC_DEFUN(STEPMAKE_INIT, [
 
     AC_PREREQ(2.50)
+    . $srcdir/VERSION
     FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL
     if test x$MY_PATCH_LEVEL != x; then
        FULL_VERSION=$FULL_VERSION.$MY_PATCH_LEVEL