X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=Makefile;h=6e13fab833a063ac89c76844ee33f788bd9288b3;hp=36e5a7c2f56231997306ecac348a3df361317fbe;hb=497f4b4f9a2757e06212fa67fa426dd5c9272a45;hpb=37f48d7da8e959ff6e0baeffb2425e13e260ad3d

diff --git a/Makefile b/Makefile
index 36e5a7c..6e13fab 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Makefile for the SST2K project
 
-VERS=$(shell sed <sst.py -n -e '/version *= *\(.*\)/s//\1/p')
+VERS=$(shell sed <sst.py -n -e '/version *= \"*\(.*\)\"/s//\1/p')
 
 MANDIR=/usr/share/man/man1
 BINDIR=/usr/bin
@@ -20,12 +20,11 @@ sst.6: doc/sst.xml
 sst.html: doc/sst.xml
 	cd doc; xmlto html-nochunks sst.xml; mv sst.html ..
 
-sst-$(VERS).tar.gz: $(SOURCES) sst.6
-	mkdir sst-$(VERS)
-	cp $(SOURCES) sst-$(VERS)
-	tar -czf sst-$(VERS).tar.gz sst-$(VERS)
-	rm -fr sst-$(VERS)
-	ls -l sst-$(VERS).tar.gz
+sst-doc.html: sst-doc.xml
+	xmlto xhtml-nochunks ../doc/sst-doc.xml
+
+super-star-trek-$(VERS).tar.gz: $(SOURCES) sst.6
+	tar --transform='s:^:super-star-trek-$(VERS)/:' --show-transformed-names -cvzf super-star-trek-$(VERS).tar.gz $(SOURCES) sst.6
 
 dist: sst-$(VERS).tar.gz
 
@@ -46,10 +45,8 @@ clean:
 	rm -f sst.6 sst.html
 	rm -f *.6 MANIFEST index.html
 
-release: sst-$(VERS).tar.gz sst.html
+release: sst-$(VERS).tar.gz sst.html sst-doc.html
 	shipper version=$(VERS) | sh -e -x
-	cd www; upload
 
 refresh: sst.html
 	shipper -N -w version=$(VERS) | sh -e -x
-	cd www; upload