[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-1136-g3bfa91c6f

[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  3bfa91c6ff748ca4150d9e6d64094851fee1ee3c (commit)
       via  85749bcb94cfeb5804815c1bccbc8907581a4eb0 (commit)
      from  dd4d46b87ac2f2a0ef7560be0406625a7311bbff (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 3bfa91c6ff748ca4150d9e6d64094851fee1ee3c
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Jul 5 15:24:57 2023 +0200

    Fix html-asset-install from out-of-tree build

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 868d8241e..5b0f9166e 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -497,7 +497,7 @@ chunked-html-web-mobile-uninstall:
 	rm -rf $(DESTDIR)$(htmldir)/postgis-web-mobile$(DOCSUFFIX)/
 
 html-assets-install: images-install
-	$(INSTALL_DATA) html/style.css $(DESTDIR)$(htmldir)/
+	$(INSTALL_DATA) $(abs_srcdir)/html/style.css $(DESTDIR)$(htmldir)/
 
 html-assets-uninstall: images-install
 	rm -f $(DESTDIR)$(htmldir)/style.css

commit 85749bcb94cfeb5804815c1bccbc8907581a4eb0
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Jul 5 15:22:47 2023 +0200

    Do not force a postgis/ suffix to given --htmldir
    
    The default htmldir already contains a ${PACKAGE} suffix

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 784ab45e2..868d8241e 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -469,38 +469,38 @@ man-uninstall:
 	rm -f $(DESTDIR)$(mandir)/man1/pgtopo_import.1
 
 html-install: html/postgis$(DOCSUFFIX).html
-	mkdir -p $(DESTDIR)$(htmldir)/postgis
-	$(INSTALL_DATA) html/postgis$(DOCSUFFIX).html $(DESTDIR)$(htmldir)/postgis/
+	mkdir -p $(DESTDIR)$(htmldir)
+	$(INSTALL_DATA) html/postgis$(DOCSUFFIX).html $(DESTDIR)$(htmldir)/
 
 html-uninstall:
-	rm -f $(DESTDIR)$(htmldir)/postgis/postgis$(DOCSUFFIX).html
+	rm -f $(DESTDIR)$(htmldir)/postgis$(DOCSUFFIX).html
 
 chunked-html-install: chunked-html
-	mkdir -p $(DESTDIR)$(htmldir)/postgis
-	cp -R html/postgis$(DOCSUFFIX) $(DESTDIR)$(htmldir)/postgis/
+	mkdir -p $(DESTDIR)$(htmldir)
+	cp -R html/postgis$(DOCSUFFIX) $(DESTDIR)$(htmldir)/
 
 chunked-html-uninstall:
-	rm -rf $(DESTDIR)$(htmldir)/postgis/postgis$(DOCSUFFIX)/
+	rm -rf $(DESTDIR)$(htmldir)/postgis$(DOCSUFFIX)/
 
 chunked-html-web-install: chunked-html-web
-	mkdir -p $(DESTDIR)$(htmldir)/postgis
-	cp -R html/postgis-web$(DOCSUFFIX) $(DESTDIR)$(htmldir)/postgis/
+	mkdir -p $(DESTDIR)$(htmldir)
+	cp -R html/postgis-web$(DOCSUFFIX) $(DESTDIR)$(htmldir)/
 
 chunked-html-web-uninstall:
-	rm -rf $(DESTDIR)$(htmldir)/postgis/postgis-web$(DOCSUFFIX)/
+	rm -rf $(DESTDIR)$(htmldir)/postgis-web$(DOCSUFFIX)/
 
 chunked-html-web-mobile-install: chunked-html-web-mobile
-	mkdir -p $(DESTDIR)$(htmldir)/postgis
-	cp -R html/postgis-web-mobile$(DOCSUFFIX) $(DESTDIR)$(htmldir)/postgis/
+	mkdir -p $(DESTDIR)$(htmldir)
+	cp -R html/postgis-web-mobile$(DOCSUFFIX) $(DESTDIR)$(htmldir)/
 
 chunked-html-web-mobile-uninstall:
-	rm -rf $(DESTDIR)$(htmldir)/postgis/postgis-web-mobile$(DOCSUFFIX)/
+	rm -rf $(DESTDIR)$(htmldir)/postgis-web-mobile$(DOCSUFFIX)/
 
 html-assets-install: images-install
-	$(INSTALL_DATA) html/style.css $(DESTDIR)$(htmldir)/postgis/
+	$(INSTALL_DATA) html/style.css $(DESTDIR)$(htmldir)/
 
 html-assets-uninstall: images-install
-	rm -f $(DESTDIR)$(htmldir)/postgis/style.css
+	rm -f $(DESTDIR)$(htmldir)/style.css
 
 docs-install: html-install html-assets-install
 	$(INSTALL_DATA) ../README.postgis $(DESTDIR)$(PGSQL_DOCDIR)/postgis/README.postgis
diff --git a/doc/html/images/Makefile.in b/doc/html/images/Makefile.in
index e757f991a..9008709a1 100644
--- a/doc/html/images/Makefile.in
+++ b/doc/html/images/Makefile.in
@@ -236,11 +236,11 @@ all: generator
 images: $(ALL_IMAGES)
 
 images-install: $(ALL_IMAGES)
-	mkdir -p $(DESTDIR)$(htmldir)/postgis/images
-	$(INSTALL_DATA) $(ALL_IMAGES) $(DESTDIR)$(htmldir)/postgis/images
+	mkdir -p $(DESTDIR)$(htmldir)/images
+	$(INSTALL_DATA) $(ALL_IMAGES) $(DESTDIR)$(htmldir)/images/
 
 images-uninstall:
-	rm -f $(ALL_IMAGES:%=$(DESTDIR)$(htmldir)/postgis/images/%)
+	rm -f $(ALL_IMAGES:%=$(DESTDIR)$(htmldir)/images/%)
 
 # Command to build each of the .o files
 $(OBJS): %.o: %.c

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

Summary of changes:
 doc/Makefile.in             | 28 ++++++++++++++--------------
 doc/html/images/Makefile.in |  6 +++---
 2 files changed, 17 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
PostGIS