Skip to content

Commit 477422c

Browse files
committed
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.
1 parent 2488ea7 commit 477422c

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

doc/src/sgml/Makefile

+6-2
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,13 @@ html-stamp: stylesheet.xsl postgres.sgml $(ALLSGML)
131131
cp $(srcdir)/stylesheet.css html/
132132
touch $@
133133

134-
htmlhelp: stylesheet-hh.xsl postgres.sgml $(ALLSGML)
134+
htmlhelp: htmlhelp-stamp
135+
136+
htmlhelp-stamp: stylesheet-hh.xsl postgres.sgml $(ALLSGML)
135137
$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
136138
$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) $(wordlist 1,2,$^)
139+
cp $(srcdir)/stylesheet.css htmlhelp/
140+
touch $@
137141

138142
# single-page HTML
139143
postgres.html: stylesheet-html-nochunk.xsl postgres.sgml $(ALLSGML)
@@ -284,7 +288,7 @@ clean:
284288
# generated SGML files
285289
rm -f $(GENERATED_SGML)
286290
# HTML Help
287-
rm -f htmlhelp.hhp toc.hhc index.hhk
291+
rm -rf htmlhelp/ htmlhelp-stamp
288292
# EPUB
289293
rm -f postgres.epub
290294
# Texinfo

doc/src/sgml/stylesheet-hh.xsl

+2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
1010
<!-- Parameters -->
1111
<xsl:param name="htmlhelp.use.hhk" select="'1'"/>
1212

13+
<xsl:param name="base.dir" select="'htmlhelp/'"></xsl:param>
1314
<xsl:param name="html.stylesheet" select="'stylesheet.css'"></xsl:param>
1415
<xsl:param name="use.id.as.filename" select="'1'"></xsl:param>
16+
<xsl:param name="manifest.in.base.dir" select="1"/>
1517
<xsl:param name="make.valid.html" select="1"></xsl:param>
1618
<xsl:param name="generate.id.attributes" select="1"></xsl:param>
1719
<xsl:param name="generate.legalnotice.link" select="1"></xsl:param>

0 commit comments

Comments
 (0)