Almost ready to ship 2.4.

diff --git a/Makefile b/Makefile
index 5e4e9cd8c15eee91586e90ead82109ccd9bd40cd..472429cf793b393717029f32d810dfba39382fb2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,36 @@
 # Makefile for blue, the Blue Moon solitaire game
 
 # Note: When the version changes, you also have to change
-#  * the name of the containing directory
+#  * the LSM file
 #  * the RPM spec file
-V=2.2
+V=2.4
 
 SOURCES = READ.ME Makefile blue.c blue.c.orig blue.6 blue.lsm *.spec
 
 blue: blue.c
-       cc -O blue.c -lncurses -o blue
+       cc -O -DVERSION=\"$(V)\" blue.c -lncurses -o blue
 
-blue.tar: $(SOURCES)
-       (cd ..; tar -cvf blue-$(V)/blue.tar `echo $(SOURCES) | sed "/\(^\| \)/s// blue-$(V)\//g"`)
-blue.tar.gz: blue.tar
-       gzip -f blue.tar
+blue-$(V).tar.gz: $(SOURCES)
+       @ls $(SOURCES) | sed s:^:blue-$(V)/: >MANIFEST
+       @(cd ..; ln -s blue blue-$(V))
+       (cd ..; tar -czvf blue/blue-$(V).tar.gz `cat blue/MANIFEST`)
+       @(cd ..; rm blue-$(V))
 
 blue.shar: $(SOURCES)
        shar $(SOURCES) >blue.shar
 
 clean:
-       rm -f blue blue.tar blue.tar.gz blue.shar *~
+       rm -f blue blue.tar blue*.gz blue*.rpm blue.shar *~
+
+dist: blue-$(V).tar.gz
+
+RPMROOT=/usr/src/redhat
+RPM = rpm
+RPMFLAGS = -ba
+rpm: dist
+       cp blue-$(V).tar.gz $(RPMROOT)/SOURCES;
+       cp blue.spec $(RPMROOT)/SPECS
+       cd $(RPMROOT)/SPECS; $(RPM) $(RPMFLAGS) blue.spec       
+       cp $(RPMROOT)/RPMS/`arch|sed 's/i[4-9]86/i386/'`/blue-$(V)*.rpm .
+       cp $(RPMROOT)/SRPMS/blue-$(V)*.src.rpm .
 
-rpm: blue.tar.gz
-       cp blue.tar.gz /usr/src/SOURCES/blue-$(V).tar.gz
-       cp blue.spec /usr/src/SPECS/blue-$(V)-1.spec
-       rpm -ba blue-$(V)-1.spec

diff --git a/bluemoon.c b/bluemoon.c
index 07b57d604caec36068ba6482874d4be0767f8ed9..feafa8a9449e3be3d918666028e7ab0af24e4798 100644 (file)
--- a/bluemoon.c
+++ b/bluemoon.c
@@ -2,7 +2,6 @@
  *                                                                           *
  *                         B l u e   M o o n                                 *
  *                         =================                                 *
- *                               V2.2b                                        *
  *                   A patience game by T.A.Lister                           *
  *            Integral screen support by Eric S. Raymond                     *
  *                                                                           *
@@ -169,8 +168,8 @@ int deal;
 
     clear();
     (void)printw(
-                "Blue Moon 2.2 - by Tim Lister & Eric Raymond - Deal %d.\n",
-                deal);
+                "Blue Moon %s - by Tim Lister & Eric Raymond - Deal %d.\n",
+                VERSION, deal);
     for(row=HEARTS;row<=CLUBS;row++)
     {
        move(BASEROW + row + row + 2, 1);