[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0rc1-654-g04f10aeaa

Sun Oct 1 02:06:41 PDT 2023

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, master has been updated
       via  04f10aeaae4e70dfc472afb481dcf9fab131dc66 (commit)
      from  acea65beac6b3cef78ff0fcd2457fb8cb0b4fe96 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 04f10aeaae4e70dfc472afb481dcf9fab131dc66
Author: Sandro Santilli <strk at kbt.io>
Date:   Sun Oct 1 11:06:02 2023 +0200

    Allow passing user flags to xsltproc, drop chunked-html-web target
    
    References #5562

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 8df679511..dd68786c1 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -395,28 +395,16 @@ chunked-html: $(html_builddir)/postgis$(DOCSUFFIX)/docbook.css
 $(html_builddir)/postgis$(DOCSUFFIX)/docbook.css: postgis-out.xml Makefile
 	$(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
 		$(XSLTPROC_CHUNKED_HTML_OPTS) \
+		$(XSLTPROCFLAGS) \
 		--output $(dir $@) \
 		$(CHUNK_HTML_DOCBOOK_XSL) \
 		$<
 
-chunked-html-web: $(html_builddir)/postgis-web$(DOCSUFFIX)/docbook.css
-$(html_builddir)/postgis-web$(DOCSUFFIX)/docbook.css: postgis-out.xml Makefile
-	$(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
-		$(XSLTPROC_CHUNKED_HTML_OPTS) \
-		--output $(dir $@) \
-		--stringparam html.script ga.js \
-		$(CHUNK_HTML_DOCBOOK_XSL) \
-		$<
-
+# TODO: drop this, replace with a generic CSS handling both mobile and # desktop
 HTML_BITS = $(wildcard html/*.html)
 chunked-html-web-mobile: $(html_builddir)/postgis-web-mobile$(DOCSUFFIX)/docbook.css
 $(html_builddir)/postgis-web-mobile$(DOCSUFFIX)/docbook.css: postgis-out.xml Makefile
-	$(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
-		$(XSLTPROC_CHUNKED_HTML_OPTS) \
-		--output $(dir $@) \
-		--stringparam html.script ga.js \
-		$(CHUNK_HTML_DOCBOOK_XSL) \
-		$<
+	$(MAKE) chunked-html
 	$(PERL) -pi -e 's/<head>/<head><meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">/g' $(HTML_BITS)
 
 html: $(html_builddir)/postgis$(DOCSUFFIX).html
diff --git a/doc/README b/doc/README
index 55f41c0ed..d08d9afb8 100644
--- a/doc/README
+++ b/doc/README
@@ -29,6 +29,9 @@ Make targets
 
 ``make chunked-html``
   generates a separate html file for every chapter or section break
+  You can use CHUNKED_HTML_USER_OPTS environment variable to tweak
+  the output, for example:
+  > make chunked-html XSLTPROCFLAGS="--stringparam html.script custom.js
 
 ``make pdf``
   generates a single PDF file with the PostGIS version as a filename

-----------------------------------------------------------------------

Summary of changes:
 doc/Makefile.in | 18 +++---------------
 doc/README      |  3 +++
 2 files changed, 6 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
PostGIS
