[Commit] nickle ChangeLog, 1.60, 1.61 Makefile.am, 1.55, 1.56 configure.in, 1.35, 1.36 nickle.1.in, 1.18, 1.19

[Keith Packard]

Committed by: keithp

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

Modified Files:
	ChangeLog Makefile.am configure.in nickle.1.in 
Log Message:
2004-05-27  Keith Packard  <keithp at keithp.com>
version 2.38

	* Makefile.am:
	* configure.in:
	* debian/changelog:
	* nickle.1.in:
	Build nickle.1 and nickle.spec from Makefile where VERSION is set
	Update to version 2.38


Index: ChangeLog
===================================================================
RCS file: /local/src/CVS/nickle/ChangeLog,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- a/ChangeLog	28 May 2004 06:02:22 -0000	1.60
+++ b/ChangeLog	28 May 2004 06:41:34 -0000	1.61
@@ -1,4 +1,14 @@
 2004-05-27  Keith Packard  <keithp at keithp.com>
+version 2.38
+
+	* Makefile.am:
+	* configure.in:
+	* debian/changelog:
+	* nickle.1.in:
+	Build nickle.1 and nickle.spec from Makefile where VERSION is set
+	Update to version 2.38
+
+2004-05-27  Keith Packard  <keithp at keithp.com>
 version 2.37
 
 	* debian/changelog:

Index: Makefile.am
===================================================================
RCS file: /local/src/CVS/nickle/Makefile.am,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- a/Makefile.am	26 May 2004 08:01:41 -0000	1.55
+++ b/Makefile.am	28 May 2004 06:41:34 -0000	1.56
@@ -18,7 +18,7 @@
 	 debian/control debian/copyright debian/rules
 	 
 EXTRA_DIST = README.name autogen.sh \
-	$(NICKLEFILES) $(DEBIAN) ChangeLog
+	$(NICKLEFILES) $(DEBIAN) ChangeLog nickle.1.in nickle.spec.in
 
 bin_PROGRAMS = nickle
 
@@ -77,11 +77,20 @@
 	cp -a $(distdir) $(distdir).orig
 	rm -rf $(distdir).orig/debian
 
+nickle.1: nickle.1.in ChangeLog config.h
+	sed -e 's,@''VERSION@,$(VERSION),' \
+	    -e 's,@''BUILD_DATE@,$(BUILD_DATE),' \
+	    -e 's,@''pkgdatadir@,$(pkgdatadir),' $(top_srcdir)/nickle.1.in > $@
+	    
+nickle.spec: nickle.spec.in ChangeLog config.h
+	sed -e 's,@''VERSION@,$(VERSION),' \
+	    -e 's,@''pkgdatadir@,$(pkgdatadir),' $(top_srcdir)/nickle.spec.in > $@
+	    
 #
 # This assumes you've got Mike Harris's rpmbuild-nonroot stuff installed
 # using the defaults
 #
-rpm: dist-gzip
+rpm: dist-gzip nickle.spec
 	mkdir -p $(HOME)/rpmbuild/$(PACKAGE)-$(VERSION)
 	cp $(PACKAGE)-$(VERSION).tar.gz $(HOME)/rpmbuild/$(PACKAGE)-$(VERSION)
 	rpm -ba nickle.spec

Index: configure.in
===================================================================
RCS file: /local/src/CVS/nickle/configure.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- a/configure.in	26 May 2004 08:01:41 -0000	1.35
+++ b/configure.in	28 May 2004 06:41:34 -0000	1.36
@@ -91,8 +91,6 @@
  examples/smlng/Makefile
  examples/turtle/Makefile
  date-sh
- version-sh
- nickle.1
- nickle.spec)
+ version-sh)
 
 AC_OUTPUT

Index: nickle.1.in
===================================================================
RCS file: /local/src/CVS/nickle/nickle.1.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- a/nickle.1.in	27 Feb 2004 03:50:16 -0000	1.18
+++ b/nickle.1.in	28 May 2004 06:41:34 -0000	1.19
@@ -1,4 +1,4 @@
-.TH NICKLE 1 "2 Apr 2001"
+.TH NICKLE 1 "@BUILD_DATE@"
 .\" $Header$
 .SH NAME
 nickle \- a desk calculator language
@@ -1312,11 +1312,11 @@
 containing Nickle code.  The library command and the -l flag,
 described above, search this path for a filename matching the
 given file.  The default library path in the
-absence of this variable is @datadir@/nickle.
+absence of this variable is @pkgdatadir at .
 .IP NICKLESTART
 The filename of the file that should be loaded as a bootstrap
 on Nickle startup.  The default in the absence of this variable
-is to load @datadir@/nickle/builtin.5c.
+is to load @pkgdatadir@/builtin.5c.
 .\"
 .SH EXAMPLES
 .PP
@@ -1397,7 +1397,7 @@
 .PP
 Nickle is
 .br
-Copyright © 1988-2004 Keith Packard and Bart Massey.  All
+Copyright \(cr 1988-2004 Keith Packard and Bart Massey.  All
 Rights Reserved. 
 .PP
 Permission is hereby granted, free of charge, to any person