X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=doc%2FMakefile;h=e7bf287e028ea506081c158d61e316588714bc46;hb=91653a10c6e6b9d57688e1d7dd7403625ea670a0;hp=eb472d988a017ed1c16ac995c880bd670c15f772;hpb=5d32d4af14c880458971e848886fa6f315b5c5a1;p=PuTTY.git

diff --git a/doc/Makefile b/doc/Makefile
index eb472d98..e7bf287e 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -3,12 +3,12 @@ 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.
+# 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 gives 'version
+# unavailable'.
 #
 # So here, we define VERSION using svnversion if it isn't already
 # defined ...
@@ -17,35 +17,49 @@ 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
+	printf '\\versionid $(VERSION)\n' > 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 := $(SITE) copy blurb intro gs using config pscp psftp plink
+CHAPTERS += pubkey pageant errors faq feedback licence udp pgpkeys sshnames
 CHAPTERS += index $(VERSIONIDS)
 
 INPUTS = $(patsubst %,%.but,$(CHAPTERS))
 
 # This is temporary. Hack it locally or something.
-HALIBUT = $(HOME)/src/halibut/build/halibut
+HALIBUT = halibut
 
 index.html: $(INPUTS)
 	$(HALIBUT) --text --html --winhelp $(INPUTS)
 
+# During formal builds it's useful to be able to build this one alone.
+putty.hlp: $(INPUTS)
+	$(HALIBUT) --winhelp $(INPUTS)
+
+putty.info: $(INPUTS)
+	$(HALIBUT) --info $(INPUTS)
+
+chm: putty.hhp
+putty.hhp: $(INPUTS) chm.but
+	$(HALIBUT) --html $(INPUTS) chm.but
+
 MKMAN = $(HALIBUT) --man=$@ mancfg.but $<
-MANPAGES = putty.1 puttygen.1 plink.1 pscp.1 psftp.1 puttytel.1 pterm.1
+MANPAGES = putty.1 puttygen.1 plink.1 pscp.1 psftp.1 puttytel.1 pterm.1 \
+           pageant.1
 man: $(MANPAGES)
 
 putty.1: man-putt.but mancfg.but; $(MKMAN)
@@ -55,6 +69,9 @@ pscp.1: man-pscp.but mancfg.but; $(MKMAN)
 psftp.1: man-psft.but mancfg.but; $(MKMAN)
 puttytel.1: man-ptel.but mancfg.but; $(MKMAN)
 pterm.1: man-pter.but mancfg.but; $(MKMAN)
+pageant.1: man-pag.but mancfg.but; $(MKMAN)
 
-clean:
-	rm -f *.html *.txt *.hlp *.cnt *.1 vstr.but
+mostlyclean:
+	rm -f *.html *.txt *.hlp *.cnt *.1 *.info vstr.but *.hh[pck]
+clean: mostlyclean
+	rm -f *.chm