[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-1075-gd9f1ec0a4

[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  d9f1ec0a473c8443fe911e2a3f8bfac574e75be3 (commit)
      from  2e6f30da278829430e15ae040bf7ac6d175fb5f8 (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 d9f1ec0a473c8443fe911e2a3f8bfac574e75be3
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Jun 29 21:15:12 2023 +0200

    Use absolute paths for XSLT, stop using subdir for entity file
    
    Fixes #5416
    Fixes #5413

diff --git a/.gitignore b/.gitignore
index 17f90ed10..b2c83d0ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,7 +36,6 @@ doc/po/*/*.xml
 doc/po/*/html
 doc/po/*/Makefile
 doc/po/*/xsl
-doc/po/*/ent
 doc/po/*/*_comments.sql
 doc/postgis_comments.sql
 doc/postgis-out.xml
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 8034bc60b..e3294670a 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -31,6 +31,7 @@ builddir = @builddir@
 top_builddir = @top_builddir@
 mandir = @mandir@
 abs_srcdir = @abs_srcdir@
+abs_builddir = @abs_builddir@
 
 POSTGIS_MAJOR_VERSION=@POSTGIS_MAJOR_VERSION@
 POSTGIS_MINOR_VERSION=@POSTGIS_MINOR_VERSION@
@@ -61,7 +62,7 @@ ifeq ($(XSLTPROCFLAGS),)
 endif
 
 XSLT_PATH= \
-	.:./ent:$(abs_srcdir):$(abs_srcdir)/ent
+	$(abs_builddir):$(abs_srcdir)
 
 XSLTPROC_PATH_OPT= \
 	--path $(XSLT_PATH)
diff --git a/doc/po/Makefile.local b/doc/po/Makefile.local
index 7c1a272a0..8ca8f1fc5 100644
--- a/doc/po/Makefile.local
+++ b/doc/po/Makefile.local
@@ -18,7 +18,6 @@ local-check: symlinks
 symlinks:
 	rm -f html; ln -s ../../html html
 	rm -f xsl; ln -s $(srcdir)/../../xsl xsl
-	rm -f ent; ln -s $(srcdir)/../../ent ent
 
 # for XML_SOURCES
 include ../../Makefile
diff --git a/doc/ent/postgis_special.ent b/doc/postgis_special.ent
similarity index 100%
rename from doc/ent/postgis_special.ent
rename to doc/postgis_special.ent

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

Summary of changes:
 .gitignore                        | 1 -
 doc/Makefile.in                   | 3 ++-
 doc/po/Makefile.local             | 1 -
 doc/{ent => }/postgis_special.ent | 0
 4 files changed, 2 insertions(+), 3 deletions(-)
 rename doc/{ent => }/postgis_special.ent (100%)


hooks/post-receive
-- 
PostGIS