aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut <peter@eisentraut.org>2019-03-27 22:03:10 +0100
committerPeter Eisentraut <peter@eisentraut.org>2019-03-27 22:03:10 +0100
commit477422c9d176784e90e630de3c92b4fae8590bd2 (patch)
tree19df3f4ef21ca3b907ebc169dbf2ab280b7d9e05
parent2488ea7a9056ab4c0f1bbf56548e829fa40f9c4c (diff)
downloadpostgresql-477422c9d176784e90e630de3c92b4fae8590bd2.tar.gz
postgresql-477422c9d176784e90e630de3c92b4fae8590bd2.zip
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.
-rw-r--r--doc/src/sgml/Makefile8
-rw-r--r--doc/src/sgml/stylesheet-hh.xsl2
2 files changed, 8 insertions, 2 deletions
diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile
index c40e6708761..72f8075c734 100644
--- 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 ae9c0c47c72..fb2da0b72f6 100644
--- 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>