From: Eric S. Raymond <esr@thyrsus.com>
Date: Thu, 14 Apr 2005 14:42:53 +0000 (+0000)
Subject: Updates for the build machinery.
X-Git-Tag: 2.0~315
X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=commitdiff_plain;h=f1af4f83e663d93c704ce0ada75ea4aa9ae3c65b

Updates for the build machinery.
---

diff --git a/makefile b/makefile
index 7745e73..5865d6b 100644
--- 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 8ec2ce3..ee37630 100644
--- 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 33d0d91..3adfbbc 100644
--- 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 82a6db8..d33984b 100755
--- 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