Clean up Makefile now that Halibut's new command-line options make

life easier.

git-svn-id: svn://svn.tartarus.org/sgt/putty@4022 cda61777-01e9-0310-a592-d414129be87e

diff --git a/doc/Makefile b/doc/Makefile
index 15bcc2f..67aa5b6 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -6,21 +6,12 @@ INPUTS = $(patsubst %,%.but,$(CHAPTERS))
 # This is temporary. Hack it locally or something.
 HALIBUT = $(HOME)/src/halibut/build/halibut
 
-DROPPINGS := output.txt output.hlp output.cnt output.1
-DROPPINGS += Contents.html IndexPage.html Chapter*.html Section*.html
-DROPPINGS += Appendix*.html
+all: man index.html
 
-all: man Contents.html
+index.html: $(INPUTS)
+       $(HALIBUT) --text --html --winhelp $(INPUTS)
 
-Contents.html: $(INPUTS)
-       $(HALIBUT) $(INPUTS)
-       rm -f index.html
-       ln -s Contents.html index.html
-       mv output.txt puttydoc.txt
-       mv output.hlp putty.hlp
-       mv output.cnt putty.cnt
-
-MKMAN = $(HALIBUT) mancfg.but $< && mv output.1 $@ && rm -f $(DROPPINGS)
+MKMAN = $(HALIBUT) --man=$@ mancfg.but $<
 MANPAGES = putty.1 puttygen.1 plink.1 pscp.1 psftp.1 puttytel.1 pterm.1
 man: $(MANPAGES)
 

diff --git a/doc/blurb.but b/doc/blurb.but
index 766dc14..5f881e7 100644 (file)
--- a/doc/blurb.but
+++ b/doc/blurb.but
@@ -1,13 +1,14 @@
 \title PuTTY User Manual
 
 \cfg{xhtml-leaf-level}{1}
-
 \cfg{xhtml-leaf-smallest-contents}{2}
-
 \cfg{xhtml-leaf-contains-contents}{true}
-
 \cfg{xhtml-body-end}{Comments to <a href='mailto:putty@projects.tartarus.org'>putty@projects.tartarus.org</a>}
 
+\cfg{xhtml-contents-filename}{index.html}
+\cfg{text-filename}{puttydoc.txt}
+\cfg{winhelp-filename}{putty.hlp}
+
 \preamble PuTTY is a free (MIT-licensed) Win32 Telnet and SSH
 client. This manual documents PuTTY, and its companion utilities
 PSCP, Plink, Pageant and PuTTYgen.
@@ -16,4 +17,4 @@ PSCP, Plink, Pageant and PuTTYgen.
 rights reserved. You may distribute this documentation under the MIT
 licence. See \k{licence} for the licence text in full.
 
-\versionid $Id: blurb.but,v 1.9 2004/01/01 16:47:48 simon Exp $
+\versionid $Id: blurb.but,v 1.10 2004/04/01 17:34:18 simon Exp $