Updates for the build machinery.

diff --git a/makefile b/makefile
index 7745e7319030f9969f1df26fd4db705dc8b6b39a..5865d6b1fac203e72426f9497e229079359126f6 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,6 +1,6 @@
 #      Makefile for the Super Star Trek game
 
-VERS=$(shell sed <sst.spec -n -e '/Version: \(.*\)/s//\1/p')
+VERSION=$(shell sed <sst.spec -n -e '/Version: \(.*\)/s//\1/p')
 
 CFLAGS= -O1 -g -Wall -DSSTDOC='"/usr/share/doc/sst/sst.doc"'
 
@@ -35,7 +35,7 @@ sst:  $(OFILES)
 $(OFILES):  $(HFILES)
 
 sst.6: sst.xml
-       xmlto --skip-validation man sst.xml
+       xmlto man sst.xml
 
 sst-doc.txt: sst-doc.xml
        xmlto -m sst-layer.xsl txt sst-doc.xml
@@ -62,13 +62,16 @@ clean:
        rm -f *.o sst sst-doc.html sst-doc.txt sst.doc
 
 # The "trunk" below assumes this is a Subversion working copy
-sst-$(VERS).tar.gz: $(SOURCES) sst.6
-       ls $(SOURCES) sst.6 | sed s:^:sst-$(VERS)/: >MANIFEST
-       (cd ..; ln -s trunk sst-$(VERS))
-       (cd ..; tar -czvf trunk/sst-$(VERS).tar.gz `cat trunk/MANIFEST`)
-       (cd ..; rm sst-$(VERS))
+sst-$(VERSION).tar.gz: $(SOURCES) sst.6
+       ls $(SOURCES) sst.6 | sed s:^:sst-$(VERSION)/: >MANIFEST
+       (cd ..; ln -s trunk sst-$(VERSION))
+       (cd ..; tar -czvf trunk/sst-$(VERSION).tar.gz `cat trunk/MANIFEST`)
+       (cd ..; rm sst-$(VERSION))
 
-dist: sst-$(VERS).tar.gz
+dist: sst-$(VERSION).tar.gz
 
-release: sst-$(VERS).tar.gz sst.html
-       shipper -f; rm -f CHANGES ANNOUNCE* *.6 *.html *.rpm *.lsm MANIFEST
+release: sst-$(VERSION).tar.gz sst.html
+       shipper; rm -f CHANGES ANNOUNCE* *.6 *.html *.rpm *.lsm MANIFEST
+
+version:
+       @echo $(VERSION)

diff --git a/sst.spec b/sst.spec
index 8ec2ce37a9a337b999a6bf341c44e3cd851a9ec1..ee3763077e7fb854cb0c74edd121e6b017b7ed67 100644 (file)
--- a/sst.spec
+++ b/sst.spec
@@ -7,6 +7,7 @@ License: GPL
 Group: Games
 Summary: Sst (screen mode)
 BuildRoot: %{_tmppath}/%{name}-root
+#Freshmeat-Name: strek
 
 %description
 Save the Federation from the invading Klingons!  Visit exotic planets and
@@ -41,3 +42,8 @@ cp sst-doc.html "$RPM_BUILD_ROOT"%{_defaultdocdir}/sst/index.html
 %{_defaultdocdir}/sst/index.html
 
 %changelog
+
+* Thu Apr 14 2005 Eric S. Raymond <esr@snark.thyrsus.com> - 2.0-1
+- First release under new management.
+
+

diff --git a/sst.xml b/sst.xml
index 33d0d913f53250dce363aac1021778824b4929ad..3adfbbc12524b429e75b9ac0180be9003b34bb91 100644 (file)
--- a/sst.xml
+++ b/sst.xml
@@ -14,10 +14,9 @@
 <refsynopsisdiv id='synopsis'>
 
 <cmdsynopsis>
-  <command>sst 
-       <arg choice='opt'>-t </arg> 
-       <arg rep='repeat' ><replaceable>command</replaceable></arg>
-  </command>
+<command>sst</command>
+<arg choice='opt'>-t </arg> 
+<arg rep='repeat' ><replaceable>command</replaceable></arg>  
 </cmdsynopsis>
 
 </refsynopsisdiv>

diff --git a/www/upload b/www/upload
index 82a6db845a9d94b6fd2350f6489e26eb0e3e8ee5..d33984b48d544cefdca70e307f2a5bdfa5d4275f 100755 (executable)
--- a/www/upload
+++ b/www/upload
@@ -2,5 +2,5 @@
 #
 # Upload gpsd docs
 #
-xmlto --skip-validation xhtml-nochunks ../sst-doc.xml
+xmlto xhtml-nochunks ../sst-doc.xml
 scp ../TODO *.html *.jpg esr@shell.berlios.de:/home/groups/sst/htdocs