[Commit] nickle Makefile.am, 1.38, 1.39 update-version.sh, 1.1, 1.2 version.m4, 1.1, 1.2

[Bart Massey]

Committed by: bart

Update of /local/src/CVS/nickle
In directory home.keithp.com:/tmp/cvs-serv11042

Modified Files:
	Makefile.am update-version.sh version.m4 
Log Message:
More fixes to make auto-version work.



Index: Makefile.am
===================================================================
RCS file: /local/src/CVS/nickle/Makefile.am,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- Makefile.am	14 Oct 2003 01:20:29 -0000	1.38
+++ Makefile.am	14 Oct 2003 01:43:55 -0000	1.39
@@ -69,7 +69,4 @@
 
 version.m4: update-version.sh \
   $(nickle_SOURCES) $(NICKLEFILES) $(NICKLEBUILTINSOURCES)
-	sh update-version.sh > version.m4.new && \
-	/bin/mv -f version.m4.new version.m4
-	sh ./autogen.sh
-	./config.status
+	sh update-version.sh

Index: update-version.sh
===================================================================
RCS file: /local/src/CVS/nickle/update-version.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- update-version.sh	14 Oct 2003 01:20:29 -0000	1.1
+++ update-version.sh	14 Oct 2003 01:43:55 -0000	1.2
@@ -11,10 +11,14 @@
     OLDHEADER="$CURHEADER"
 fi
 
-echo dnl 'This file is maintained automatically by update-version.sh'
-echo dnl 'The file format is finicky, so do not hand-edit lightly.'
-echo dnl 'Last updated' "`date`"
-echo dnl CURHEADER "\$$CURHEADER\$"
-echo dnl OLDHEADER "<$OLDHEADER>"
-echo dnl CURVERSION $CURVERSION
-echo "define([VERSION_NUMBER],[$CURVERSION])"
+( echo dnl 'This file is maintained automatically by update-version.sh'
+  echo dnl 'The file format is finicky, so do not hand-edit lightly.'
+  echo dnl 'Last updated' "`date`"
+  echo dnl CURHEADER "\$$CURHEADER\$"
+  echo dnl OLDHEADER "<$OLDHEADER>"
+  echo dnl CURVERSION $CURVERSION
+  echo "define([VERSION_NUMBER],[$CURVERSION])" ) > version.m4.new &&
+/bin/mv -f version.m4.new version.m4
+
+( echo '/* This file is maintained automatically by update-version.sh */'
+  echo "#define BUILD_VERSION \"$CURVERSION\"" ) > builtin/version.h

Index: version.m4
===================================================================
RCS file: /local/src/CVS/nickle/version.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- version.m4	14 Oct 2003 01:20:29 -0000	1.1
+++ version.m4	14 Oct 2003 01:43:55 -0000	1.2
@@ -1,4 +1,7 @@
+dnl This file is maintained automatically by update-version.sh
+dnl The file format is finicky, so do not hand-edit lightly.
+dnl Last updated Mon Oct 13 18:42:39 PDT 2003
 dnl CURHEADER $Header$
-dnl OLDHEADER <Header: /local/src/CVS/nickle/version.m4,v 1.00 2003/10/13 00:01:00 bart Exp >
-dnl CURVERSION 2.20
-define([VERSION_NUMBER],[2.20])
+dnl OLDHEADER <Header: /local/src/CVS/nickle/version.m4,v 1.1 2003/10/14 01:20:29 bart Exp >
+dnl CURVERSION 2.21
+define([VERSION_NUMBER],[2.21])