X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=doc%2FMakefile;h=96a19eb175a55273b0f46eae835065f55c0511a5;hb=f004bcca17a789356c32527a396b68b71a773db2;hp=c60a6d07f854320a21abba570c7d9776c269bf25;hpb=7418a9a37fe0bfc06bd601f251f74abb01e929b1;p=PuTTY.git

diff --git a/doc/Makefile b/doc/Makefile
index c60a6d07..96a19eb1 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 ...
@@ -28,24 +28,35 @@ endif
 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 += 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
 man: $(MANPAGES)
@@ -58,5 +69,7 @@ psftp.1: man-psft.but mancfg.but; $(MKMAN)
 puttytel.1: man-ptel.but mancfg.but; $(MKMAN)
 pterm.1: man-pter.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