[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-1254-geb0549cd9

[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  eb0549cd9b00ceabb5e807f35db0435891f3b237 (commit)
      from  aa5466846937c8d8c84966b0ea914857c572ee2e (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 eb0549cd9b00ceabb5e807f35db0435891f3b237
Author: Sandro Santilli <strk at kbt.io>
Date:   Fri Jul 14 15:33:30 2023 +0200

    Prepare input for generated xml only once

diff --git a/.gitignore b/.gitignore
index 956cc57e7..4d852102f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,6 +39,7 @@ doc/Makefile
 doc/Makefile.comments
 doc/**.xsl.xml
 *.tag
+doc/postgis-nospecial.xml
 doc/po/*/*.xml
 doc/po/*/html
 doc/po/*/Makefile
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 0d3625322..a87f56576 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -291,11 +291,14 @@ update-po: $(XML_INPUTS_POT)
   done
 endif
 
+postgis-nospecial.xml: postgis-out.xml
+	grep -v '\&postgis_special;' $< > $@
+
 ifeq ($(XSLTPROC),)
 $(XSL_GENERATED_SOURCES): requirements_not_met_xsltproc
 else
-$(XSL_GENERATED_SOURCES): %.xsl.xml: xsl/%.xml.xsl postgis-out.xml xsl-config.xml $(TAG_GENERATED_SOURCES) $(XML_SOURCES)
-	grep -v '\&postgis_special;' postgis-out.xml | $(XSLTPROC) --novalid $(XSLTPROC_PATH_OPT) -o $@ $< -
+$(XSL_GENERATED_SOURCES): %.xsl.xml: xsl/%.xml.xsl postgis-nospecial.xml xsl-config.xml $(TAG_GENERATED_SOURCES) $(XML_SOURCES)
+	$(XSLTPROC) --novalid $(XSLTPROC_PATH_OPT) -o $@ $< postgis-nospecial.xml
 endif
 
 ifeq ($(XMLLINT),)
@@ -449,6 +452,7 @@ cheatsheet-clean:
 clean: images-clean html-clean pdf-clean epub-clean cheatsheet-clean
 	rm -f images # work around https://trac.osgeo.org/postgis/ticket/5422
 	rm -f $(XML_GENERATED_SOURCES)
+	rm -f postgis-nospecial.xml
 	rm -f $(TAG_GENERATED_SOURCES)
 	$(MAKE) -C $(images_builddir) clean
 	rm -f postgis_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql

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

Summary of changes:
 .gitignore      | 1 +
 doc/Makefile.in | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
PostGIS