Fix a couple of code paths on which, if fxp_readdir returned an error,

[sgt/putty] / doc / Makefile

diff --git a/doc/Makefile b/doc/Makefile
index eb472d9..89b4be9 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -17,10 +17,12 @@ 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
@@ -33,17 +35,28 @@ 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)
@@ -56,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