[Commit] nickle/builtin Makefile.am, 1.8, 1.9 builtin.c, 1.12, 1.13 builtin.h, 1.4, 1.5

[Bart Massey]

Committed by: bart

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

Modified Files:
	Makefile.am builtin.c builtin.h 
Log Message:
More fixes to make auto-version work.



Index: Makefile.am
===================================================================
RCS file: /local/src/CVS/nickle/builtin/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am	29 Jun 2003 18:16:20 -0000	1.8
+++ Makefile.am	14 Oct 2003 01:43:55 -0000	1.9
@@ -16,3 +16,7 @@
 
 ../gram.h:
 	$(MAKE) -C .. gram.h
+
+version.h: ../version.m4
+	( cd .. && sh update-version.sh )
+

Index: builtin.c
===================================================================
RCS file: /local/src/CVS/nickle/builtin/builtin.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- builtin.c	22 Jul 2003 04:32:36 -0000	1.12
+++ builtin.c	14 Oct 2003 01:43:55 -0000	1.13
@@ -47,7 +47,11 @@
     { "+ ",	    "prompt2" },
     { "- ",	    "prompt3" },
     { "%g",	    "format" },
-    { VERSION,	    "version" },
+#ifdef BUILD_VERSION
+    { BUILD_VERSION, "version" },
+#else
+    { VERSION, "version" },
+#endif
 #ifdef BUILD
     { BUILD,	    "build" },
 #else

Index: builtin.h
===================================================================
RCS file: /local/src/CVS/nickle/builtin/builtin.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- builtin.h	17 Oct 2002 15:54:17 -0000	1.4
+++ builtin.h	14 Oct 2003 01:43:55 -0000	1.5
@@ -14,6 +14,7 @@
 
 #include	"nickle.h"
 #include	"gram.h"
+#include        "version.h"
 
 SymbolPtr
 BuiltinAddName (NamespacePtr	*namespacep,