Ready to ship.

diff --git a/Makefile b/Makefile
index f052fd846f8390795503609b3c5c448328fd5e61..0fd46a5b77c13c1c6bb863c46e68570460e30721 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,29 +2,35 @@
 # Makefile for the card probability calculator
 #
 # Note: When the version changes, you also have to change
-#  * the name of the containing directory
-#  * the RPM spec file
-V=2.0
+# the RPM spec file and the lsm.
+VERS=2.1
 
-SRC = Makefile deal.c deal.1 deal.lsm deal.spec
+SOURCES = README Makefile deal.c deal.1 deal.lsm deal.spec
 
 deal: deal.c
        $(CC) -g deal.c  -lm -o deal
 
-deal.shar: $(SRC)
-       shar $(SRC) >deal.shar
+deal-$(VERS).tar.gz: $(SOURCES)
+       @ls $(SOURCES) | sed s:^:deal-$(VERS)/: >MANIFEST
+       @(cd ..; ln -s deal deal-$(VERS))
+       (cd ..; tar -czvf deal/deal-$(VERS).tar.gz `cat deal/MANIFEST`)
+       @(cd ..; rm deal-$(VERS))
 
-deal.tar: $(SRC)
-       (cd ..; tar -cvf deal-$(V)/deal.tar `echo $(SRC) | sed "/\(^\| \)/s// deal-$(V)\//g"`)
-deal.tar.gz: deal.tar
-       gzip -f deal.tar
+deal-$(VERS).shar:
+       shar $(SOURCES) >deal-$(VERS).shar
 
-clean:
-       rm -f deal deal.shar deal.tar deal.tar.gz
+dist: deal-$(VERS).tar.gz
 
-rpm: deal.tar.gz
-       cp deal.tar.gz /usr/src/SOURCES/deal-$(V).tar.gz
-       cp deal.spec /usr/src/SPECS/deal-$(V)-1.spec
-       rpm -ba deal-$(V)-1.spec
+RPMROOT=/usr/src/redhat
+RPM = rpm
+RPMFLAGS = -ba
+rpm: dist
+       cp deal-$(VERS).tar.gz $(RPMROOT)/SOURCES;
+       cp deal.spec $(RPMROOT)/SPECS
+       cd $(RPMROOT)/SPECS; $(RPM) $(RPMFLAGS) deal.spec       
+       cp $(RPMROOT)/RPMS/`arch|sed 's/i[4-9]86/i386/'`/deal-$(VERS)*.rpm .
+       cp $(RPMROOT)/SRPMS/deal-$(VERS)*.src.rpm .
 
+clean:
+       rm -f deal deal-*.tar.gz deal.shar deal.o *.rpm *~