[SCM] PostGIS branch master updated. 3.4.0rc1-871-g305c7a823

[git at osgeo.org]

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  305c7a823cf7255f96ff7535ded91d628babbbc3 (commit)
      from  6aedb1434727fa1eba29620a7d3fd0bfca49e94a (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 305c7a823cf7255f96ff7535ded91d628babbbc3
Author: Chris Mayo <aklhfex at gmail.com>
Date:   Mon Dec 18 19:22:21 2023 +0000

    Don't create docbook.css for the HTML manual
    
    We have our own style.css.

diff --git a/NEWS b/NEWS
index 9f233fb4f..68b4bfbbd 100644
--- a/NEWS
+++ b/NEWS
@@ -46,6 +46,8 @@ To take advantage of all SFCGAL featurs, SFCGAL 1.5.0+ is needed.
   - #5543, allow building without documentation (Sandro Santilli)
   - #5596, GH-749, Allow promoting column as an id
           in ST_AsGeoJson(record,..). (Jan Tojnar)
+  - GH-744, Don't create docbook.css for the HTML manual,
+            use style.css instead (Chris Mayo)
 
 
 PostGIS 3.4.0
diff --git a/doc/Makefile.in b/doc/Makefile.in
index ef49099d8..8dacae4af 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -106,6 +106,7 @@ XSLTPROC_COMMONOPTS= \
 	--param header.rule 0 \
 	--param footer.rule 0 \
 	--param table.borders.with.css 1 \
+	--stringparam docbook.css.source "" \
 	--stringparam html.ext .html \
 	--stringparam saxon.character.representation decimal \
 	$(XSLTPROCFLAGS)
@@ -392,8 +393,8 @@ postgis-out.xml: postgis.xml Makefile $(XML_INPUTS) Makefile
 	$(PERL) -lpe "s'@@LAST_RELEASE_VERSION@@'${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}'g;s'@@POSTGIS_DOWNLOAD_URL@@'${POSTGIS_DOWNLOAD_URL}'g;" $< > $@.in
 	$(XMLLINT) $(XSLTPROC_PATH_OPT) --noent -o $@ $@.in
 
-chunked-html: $(html_builddir)/postgis$(DOCSUFFIX)/docbook.css
-$(html_builddir)/postgis$(DOCSUFFIX)/docbook.css: postgis-out.xml Makefile
+chunked-html: $(html_builddir)/postgis$(DOCSUFFIX)/index.html
+$(html_builddir)/postgis$(DOCSUFFIX)/index.html: postgis-out.xml Makefile
 	$(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
 		$(XSLTPROC_CHUNKED_HTML_OPTS) \
 		$(XSLTPROCFLAGS) \
@@ -484,7 +485,6 @@ images images-install images-uninstall images-clean:
 	$(MAKE) -C $(images_builddir) $@
 
 html-clean:
-	rm -f $(html_builddir)/docbook.css
 	rm -f $(html_builddir)/postgis$(DOCSUFFIX).html
 	rm -rf $(html_builddir)/postgis$(DOCSUFFIX)/
 
diff --git a/doc/introduction.xml b/doc/introduction.xml
index 892db9ba1..d99f68e9e 100644
--- a/doc/introduction.xml
+++ b/doc/introduction.xml
@@ -241,6 +241,7 @@
 					<member>Bryce L. Nordgren</member>
 					<member>Carl Anderson</member>
 					<member>Charlie Savage</member>
+					<member>Chris Mayo</member>
 					<member>Christian Schroeder</member>
 					<member>Christoph Berg</member>
 					<member>Christoph Moench-Tegeder</member>

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

Summary of changes:
 NEWS                 | 2 ++
 doc/Makefile.in      | 6 +++---
 doc/introduction.xml | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
PostGIS