From 477422c9d176784e90e630de3c92b4fae8590bd2 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Wed, 27 Mar 2019 22:03:10 +0100 Subject: [PATCH] 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. --- doc/src/sgml/Makefile | 8 ++++++-- doc/src/sgml/stylesheet-hh.xsl | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile index c40e670876..72f8075c73 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 ae9c0c47c7..fb2da0b72f 100644 --- a/doc/src/sgml/stylesheet-hh.xsl +++ b/doc/src/sgml/stylesheet-hh.xsl @@ -10,8 +10,10 @@ + +