Manual merge of GitLab MR !1

[super-star-trek.git] / Makefile

diff --git a/Makefile b/Makefile
index 536f6c5b4e40352433fd715559cbb925f0d0d19c..ed66d50741df8fab2a7547ab11dee71ecebb7902 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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,6 +20,9 @@ sst.6: doc/sst.xml
 sst.html: doc/sst.xml
        cd doc; xmlto html-nochunks sst.xml; mv sst.html ..
 
+sst-doc.html: doc/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
 
@@ -42,10 +45,10 @@ 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