X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=Makefile;h=8cc3ca550d7cf84a52a40d9aa7b60e1f924abfea;hp=dea081f9bd69d60553460874825de085151a69a2;hb=708a55633712f9981231e80360ac5e3fe81b1d3b;hpb=c52b8d636f9dc61df87759d1b0e772de4ae621d3

diff --git a/Makefile b/Makefile
index dea081f..8cc3ca5 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
@@ -8,7 +8,7 @@ BINDIR=/usr/bin
 DOCS    = README COPYING NEWS doc/HACKING doc/sst-doc.xml doc/sst-layer.xsl doc/sst.xml
 SOURCES = sst.py Makefile replay doc/makehelp.py control $(DOCS)
 
-all: sst-$(VERS).tar.gz
+all: super-star-trek-$(VERS).tar.gz
 
 install: sst.6
 	cp sst.py $(BINDIR)
@@ -20,33 +20,28 @@ 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: doc/sst-doc.xml
+	xmlto xhtml-nochunks doc/sst-doc.xml
 
-dist: sst-$(VERS).tar.gz
+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
 
-check: #pylint
-	cd test; make --quiet
+dist: sst-$(VERS).tar.gz
 
-pychecker:
-	@-pychecker --quiet --only --limit 50 sst.py
+check: pylint
+	cd test; $(MAKE) --quiet
 
-PYLINTOPTS = --rcfile=/dev/null --reports=n --include-ids=y --disable=C0103,C0111,C0301,C0302,C0321,R0902,R0903,R0911,R0912,R0914,R0915,W0312,W0603
 pylint:
-	@pylint --output-format=parseable $(PYLINTOPTS) sst.py
+	@pylint sst.py
 
 clean:
 	rm -f sst.6 sst.html
 	rm -f *.6 MANIFEST index.html
 
-release: sst-$(VERS).tar.gz sst.html
-	shipper version=$(VERS) | sh -e -x
-	cd www; upload
+SHIPPER = version=$(VERS) bkgimage=lpt.jpg
+
+release: super-star-trek-$(VERS).tar.gz sst.html sst-doc.html
+	shipper $(SHIPPER) | sh -e -x
 
 refresh: sst.html
-	shipper -N -w version=$(VERS) | sh -e -x
-	cd www; upload
+	shipper -N -w $(SHIPPER)  | sh -e -x