X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=doc%2FMakefile;h=9ac45e8af122bc7156a2e6401ebc32f362729b8f;hb=11655820ca7ba0e3f15a900eb3c75f60b66944d5;hp=67aa5b6ad6ecbfe3fd554449d12f6836823f2bba;hpb=7843ab696adbd9cc39cd07ffea736625667caf42;p=PuTTY.git

diff --git a/doc/Makefile b/doc/Makefile
index 67aa5b6a..9ac45e8a 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,12 +1,47 @@
+all: man index.html
+
+# Decide on the versionid policy.
+#
+# If the user has passed in $(VERSION) on the command line (`make
+# VERSION="Release 0.56"'), we use that as an explicit version
+# string. Otherwise, we use `svnversion' to examine the checked-out
+# documentation source, and if that returns a single revision
+# number then we invent a version string reflecting just that
+# number. Failing _that_, we resort to versionids.but which shows a
+# $Id for each individual file.
+#
+# So here, we define VERSION using svnversion if it isn't already
+# defined ...
+ifndef VERSION
+SVNVERSION=$(shell test -d .svn && svnversion .)
+BADCHARS=$(findstring :,$(SVNVERSION))$(findstring S,$(SVNVERSION))
+ifeq ($(BADCHARS),)
+ifneq ($(SVNVERSION),)
+ifneq ($(SVNVERSION),exported)
+VERSION=Built from revision $(patsubst M,,$(SVNVERSION))
+endif
+endif
+endif
+endif
+# ... and now, we condition our build behaviour on whether or not
+# VERSION _is_ defined.
+ifdef VERSION
+VERSIONIDS=vstr
+vstr.but: FORCE
+	echo \\versionid $(VERSION) > vstr.but
+FORCE:;
+else
+VERSIONIDS=vids
+endif
+
 CHAPTERS := $(SITE) blurb intro gs using config pscp psftp plink pubkey
-CHAPTERS += pageant errors faq feedback licence
+CHAPTERS += pageant errors faq feedback licence udp
+CHAPTERS += index $(VERSIONIDS)
 
 INPUTS = $(patsubst %,%.but,$(CHAPTERS))
 
 # This is temporary. Hack it locally or something.
-HALIBUT = $(HOME)/src/halibut/build/halibut
-
-all: man index.html
+HALIBUT = halibut
 
 index.html: $(INPUTS)
 	$(HALIBUT) --text --html --winhelp $(INPUTS)
@@ -24,4 +59,4 @@ puttytel.1: man-ptel.but mancfg.but; $(MKMAN)
 pterm.1: man-pter.but mancfg.but; $(MKMAN)
 
 clean:
-	rm -f *.html *.txt *.hlp *.cnt *.1
+	rm -f *.html *.txt *.hlp *.cnt *.1 vstr.but