[postgis-tickets] [SCM] PostGIS branch master updated. 3.2.0-593-gf216e6a0c

git at osgeo.org git at osgeo.org
Wed Feb 23 09:28:57 PST 2022


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  f216e6a0cfb34cfa890f1147a0cfe73186dff3a5 (commit)
      from  7b31076f5be8bb3048485a38aa287f3521e6d966 (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 f216e6a0cfb34cfa890f1147a0cfe73186dff3a5
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Feb 23 18:28:38 2022 +0100

    Fix out-of-tree install target for loader

diff --git a/loader/Makefile.in b/loader/Makefile.in
index 00ad73f14..ffe00c221 100644
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -128,19 +128,19 @@ $(SHP2PGSQL-GUI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-gui.o pgsql2shp-core
 installdir:
 	@mkdir -p $(DESTDIR)$(bindir)
 
-install-desktop:
+install-desktop: shp2pgsql-gui.desktop
 ifdef gtk_build
 	mkdir -p $(DESTDIR)$(datadir)/applications
-	$(INSTALL_DATA) shp2pgsql-gui.desktop $(DESTDIR)$(datadir)/applications/shp2pgsql-gui.desktop
+	$(INSTALL_DATA) $^ $(DESTDIR)$(datadir)/applications/shp2pgsql-gui.desktop
 endif
 
 ICON_SIZES = 8x8 16x16 22x22 24x24 32x32 36x36 40x40 42x42 48x48 64x64
 
-install-icons:
+install-icons: $(ICONS)
 ifdef gtk_build
 	for size in $(ICON_SIZES); do \
 		mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/$${size}/apps; \
-		$(INSTALL_DATA) icons/hicolor/$${size}/apps/shp2pgsql-gui.png $(DESTDIR)$(datadir)/icons/hicolor/$${size}/apps/shp2pgsql-gui.png; \
+		$(INSTALL_DATA) $(srcdir)/icons/hicolor/$${size}/apps/shp2pgsql-gui.png $(DESTDIR)$(datadir)/icons/hicolor/$${size}/apps/shp2pgsql-gui.png; \
 	done
 endif
 

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

Summary of changes:
 loader/Makefile.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
PostGIS


More information about the postgis-tickets mailing list