[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-1149-g7ab2ee426

[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  7ab2ee42624d3af920bedd37673430f79becf147 (commit)
       via  9fe7b731b3b3e0c947492dca218edae217dd9049 (commit)
      from  1633c580582977ef3de8bb029706328173e217cb (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 7ab2ee42624d3af920bedd37673430f79becf147
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Jul 5 23:01:51 2023 +0200

    Fix make clean to clean localized assets too
    
    Closes #5431

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 10c58f929..41945984f 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -410,7 +410,7 @@ html-clean:
 	rm -rf html/postgis-web$(DOCSUFFIX)/
 	rm -rf html/postgis-web-mobile$(DOCSUFFIX)/
 
-clean: html-clean clean-localized
+clean: html-clean html-clean-localized
 	rm -f *.pdf
 	rm -f *.epub
 	rm -f images # work around https://trac.osgeo.org/postgis/ticket/5422
@@ -420,6 +420,7 @@ clean: html-clean clean-localized
 	rm -f postgis_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql
 	rm -f raster_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql
 	rm -f *.tmp
+	$(MAKE) clean-localized
 
 distclean: clean distclean-localized
 	$(MAKE) -C html/images distclean
diff --git a/doc/po/Makefile.local b/doc/po/Makefile.local
index 019d28d1f..7936696d2 100644
--- a/doc/po/Makefile.local
+++ b/doc/po/Makefile.local
@@ -5,7 +5,7 @@ local-all: local-html comments
 
 # We do not want to recurse in parent dir here
 local-clean:
-	rm -f $(XML_SOURCES)
+	rm -f $(XML_INPUTS)
 	rm -f html
 	rm -f xsl
 

commit 9fe7b731b3b3e0c947492dca218edae217dd9049
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Jul 5 22:49:06 2023 +0200

    Have localized dirs cleaned up on make clean
    
    Closes #5431

diff --git a/doc/Makefile.in b/doc/Makefile.in
index cf4287827..10c58f929 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -410,7 +410,7 @@ html-clean:
 	rm -rf html/postgis-web$(DOCSUFFIX)/
 	rm -rf html/postgis-web-mobile$(DOCSUFFIX)/
 
-clean: html-clean
+clean: html-clean clean-localized
 	rm -f *.pdf
 	rm -f *.epub
 	rm -f images # work around https://trac.osgeo.org/postgis/ticket/5422
@@ -421,12 +421,9 @@ clean: html-clean
 	rm -f raster_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql
 	rm -f *.tmp
 
-distclean: clean
+distclean: clean distclean-localized
 	$(MAKE) -C html/images distclean
 	rm -f Makefile Makefile.comments html/image_src/Makefile
-	for lang in $(translations); do \
-		rm -f po/$$lang/Makefile; \
-	done
 
 maintainer-clean: clean images-clean
 	rm -f postgis_comments.sql raster_comments.sql topology_comments.sql tiger_geocoder_comments.sql sfcgal_comments.sql
diff --git a/doc/po/Makefile.local b/doc/po/Makefile.local
index 0af8d1b98..019d28d1f 100644
--- a/doc/po/Makefile.local
+++ b/doc/po/Makefile.local
@@ -3,6 +3,16 @@
 
 local-all: local-html comments
 
+# We do not want to recurse in parent dir here
+local-clean:
+	rm -f $(XML_SOURCES)
+	rm -f html
+	rm -f xsl
+
+# We do not want to recurse in parent dir here
+local-distclean:
+	rm -f Makefile
+
 local-%: symlinks
 	$(MAKE) $(patsubst local-%,%,$@) DOCSUFFIX=$(DOCSUFFIX)
 

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

Summary of changes:
 doc/Makefile.in       |  8 +++-----
 doc/po/Makefile.local | 10 ++++++++++
 2 files changed, 13 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
PostGIS