Version bump.

diff --git a/Makefile b/Makefile
index 73bc1cfb7181b6d4349260cb27a8e2271fd6fa3a..8b326e177fd73fa9aa5a81f88652dd913976b7db 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,15 +6,18 @@
 #  - this will create a high score file in /usr/tmp, so doing it again
 #    later on will erase high scores for the machine.
 
+# Don't forget to change the spec file when you bump the version number.
+VERSION=2.1
+
 CFLAGS=-O -DIBM
 LFLAGS = -s
 OBJS= MoveR.o MoveL.o DrawP.o AdvanceP.o Rotate.o Colors.o tet.o
 INCS= tet.h
 
-SOURCES = READ.ME Makefile tet.h $(OBJS:.o=.c)
+SOURCES = 
 
 tetrix: $(OBJS) $(INCS)
-       cc $(LFLAGS) $(OBJS) -ldcurses -o tetrix
+       cc $(LFLAGS) $(OBJS) -lncurses -o tetrix
 
 MoveR.o: MoveR.c tet.h
 MoveL.o: MoveL.c tet.h
@@ -24,17 +27,35 @@ Rotate.o: Rotate.c tet.h
 Colors.o: Colors.c tet.h
 tet.o: tet.c tet.h
 
-install: tetrix
-       chmod 755 tetrix
-       /bin/mv -f tetrix /usr/local/bin
+tetrix.6: tetrix.xml
+       xmlto man tetrix.xml
 
-tetrix.tar: $(SOURCES)
-       tar -cvf tetrix.tar $(SOURCES)
-tetrix.tar.gz: tetrix.tar
-       rm -f tetrix.tar.gz; gzip tetrix.tar
+install: tetrix.6 uninstall
+       cp tetrix /usr/bin
+       cp tetrix.6 /usr/share/man/man6/tetrix.6
 
-tetrix.shar: $(SOURCES)
-       shar $(SOURCES) >tetrix.shar
+uninstall:
+       rm -f /usr/bin/install /usr/share/man/man6/tetrix.6
 
 clean:
-       /bin/rm -rf tetrix core *.o tetrix.shar tetrix.tar tetrix.tar.gz
+       rm -f tetrix tetrix.6 tetrix-*.rpm tetrix-*.tar.gz *~
+
+SOURCES = READ.ME COPYING tetrix.xml Makefile tet.h $(OBJS:.o=.c) tetrix.spec
+
+tetrix-$(VERS).tar.gz: $(SOURCES) tetrix.6
+       @ls $(SOURCES) tetrix.6 | sed s:^:tetrix-$(VERS)/: >MANIFEST
+       @(cd ..; ln -s tetrix tetrix-$(VERS))
+       (cd ..; tar -czvf tetrix/tetrix-$(VERS).tar.gz `cat tetrix/MANIFEST`)
+       @(cd ..; rm tetrix-$(VERS))
+
+dist: tetrix-$(VERS).tar.gz
+
+RPMROOT=/usr/src/redhat
+RPM = rpm
+RPMFLAGS = -ba
+rpm: dist
+       cp tetrix-$(VERS).tar.gz $(RPMROOT)/SOURCES;
+       cp tetrix.spec $(RPMROOT)/SPECS
+       cd $(RPMROOT)/SPECS; $(RPM) $(RPMFLAGS) tetrix.spec     
+       cp $(RPMROOT)/RPMS/`arch|sed 's/i[4-9]86/i386/'`/tetrix-$(VERS)*.rpm .
+       cp $(RPMROOT)/SRPMS/tetrix-$(VERS)*.src.rpm .

diff --git a/README b/README
index 0aaef260a262615c2c93dc6d5a9e59c60b34d230..71cea7be8a1901d1981a3e12be5231090c94b125 100644 (file)
--- a/README
+++ b/README
@@ -49,3 +49,7 @@ expect to have to hack it again.  Thus the envoi
 
        Good bye!                                       Eric S. Raymond
 
+August 2002: It's very likely that nobody cares, but I'm reissuing this
+with XML documentation and modern packaging.
+
+       Good bye again!                                 Eric S. Raymond