From dd8a0531c27bf8a0b3dd2ed1fa50b0846a1dd97a Mon Sep 17 00:00:00 2001
From: janneke <janneke>
Date: Mon, 22 Sep 2003 18:09:01 +0000
Subject: [PATCH] * stepmake/aclocal.m4: * make/stepmake.make: *
 make/toplevel-version.make: Revert/fix VERSION/PACKAGE stuff.

---
 ChangeLog                  | 6 ++++++
 make/stepmake.make         | 2 +-
 make/toplevel-version.make | 1 +
 stepmake/aclocal.m4        | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 6d85123ef6..52ae0efd06 100644
--- 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 c73d4451be..dee7d04835 100644
--- 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 37d7e5a2ce..f657bfecee 100644
--- 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 4fb45c386a..086c69befc 100644
--- 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
-- 
2.39.5