doc: Move htmlhelp output to subdirectory

This makes it behave more like the html output.  That will make some
subsequent changes across all output formats easier.

diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile
index c40e6708761414159425c2cc014d98e6e85d63ea..72f8075c73427edb3e6a9848b358701b1c60b120 100644 (file)
--- a/doc/src/sgml/Makefile
+++ b/doc/src/sgml/Makefile
@@ -131,9 +131,13 @@ html-stamp: stylesheet.xsl postgres.sgml $(ALLSGML)
        cp $(srcdir)/stylesheet.css html/
        touch $@
 
-htmlhelp: stylesheet-hh.xsl postgres.sgml $(ALLSGML)
+htmlhelp: htmlhelp-stamp
+
+htmlhelp-stamp: stylesheet-hh.xsl postgres.sgml $(ALLSGML)
        $(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
        $(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) $(wordlist 1,2,$^)
+       cp $(srcdir)/stylesheet.css htmlhelp/
+       touch $@
 
 # single-page HTML
 postgres.html: stylesheet-html-nochunk.xsl postgres.sgml $(ALLSGML)
@@ -284,7 +288,7 @@ clean:
 # generated SGML files
        rm -f $(GENERATED_SGML)
 # HTML Help
-       rm -f htmlhelp.hhp toc.hhc index.hhk
+       rm -rf htmlhelp/ htmlhelp-stamp
 # EPUB
        rm -f postgres.epub
 # Texinfo

diff --git a/doc/src/sgml/stylesheet-hh.xsl b/doc/src/sgml/stylesheet-hh.xsl
index ae9c0c47c722fcfa05e6030419c49339874a50f5..fb2da0b72f68acfee6f66b7a29a6ccbe758f0cf1 100644 (file)
--- a/doc/src/sgml/stylesheet-hh.xsl
+++ b/doc/src/sgml/stylesheet-hh.xsl
@@ -10,8 +10,10 @@
 <!-- Parameters -->
 <xsl:param name="htmlhelp.use.hhk" select="'1'"/>
 
+<xsl:param name="base.dir" select="'htmlhelp/'"></xsl:param>
 <xsl:param name="html.stylesheet" select="'stylesheet.css'"></xsl:param>
 <xsl:param name="use.id.as.filename" select="'1'"></xsl:param>
+<xsl:param name="manifest.in.base.dir" select="1"/>
 <xsl:param name="make.valid.html" select="1"></xsl:param>
 <xsl:param name="generate.id.attributes" select="1"></xsl:param>
 <xsl:param name="generate.legalnotice.link" select="1"></xsl:param>