[clhp-cvs] CVS update: clhp/Makefile

[Anthony Ventimiglia]

Update of /project/clhp/cvsroot/clhp
In directory common-lisp.net:/tmp/cvs-serv24854

Modified Files:
	Makefile 
Log Message:
Got cvs-type versioning working, this way if someone does a "make
dist" on the cvs they won't get a mislabeled version

Date: Thu Oct 16 15:40:18 2003
Author: aventimiglia

Index: clhp/Makefile
diff -u clhp/Makefile:1.13 clhp/Makefile:1.14
--- clhp/Makefile:1.13	Thu Oct 16 15:31:59 2003
+++ clhp/Makefile	Thu Oct 16 15:40:18 2003
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.13 2003/10/16 19:31:59 aventimiglia Exp $
+# $Id: Makefile,v 1.14 2003/10/16 19:40:18 aventimiglia Exp $
 #
 # CLHP the Common Lisp Hypertext Preprocessor
 # (C) 2003 Anthony J Ventimiglia
@@ -77,9 +77,17 @@
 # This is the version for the next release, during cvs development the
 # real version number is based on the date of the last change to
 # clhp.lisp, the only place this version carries in is during
-# make-dist. 
-CVSID=$(shell echo \
-	 $$Date: 2003/10/16 19:31:59 $$  )
+# make-dist.
+#
+# I've put a nice little trick to make sure tarballs made with make
+# dist have a cvs-type versioning number. The version here in the
+# makefile most likeley will not match the cvs version ID in
+# clhp.lisp, since they depend on their own file's cvs date keyword.
+
+CVSID=$(shell echo $Date: 2003/10/16 19:40:18 $ | \
+	awk '{print $$2}'| sed s/\\///g )cvs
+
+VERSION=$(CVSID)
 #VERSION=0.1.2alpha
 TARROOT=clhp-$(VERSION)
 TARBALL=$(TARROOT).tar.gz
@@ -87,9 +95,6 @@
 RECURSIVE_TARGETS=clean-recursive clean-all-recursive check-recursive
 
 all: $(LISPCBIN) $(LIBS) $(CORE) $(RUNCGI)
-
-version: 
-	echo $(CVSID)
 
 .PHONY: all install uninstall clean clean-all clean-backups install-dirs \
 	install-source install-source-dirs uninstall-files uninstall-dirs \