[postgis-tickets] r16073 - Hard-code build-aux/install-sh in all install scripts

Regina Obe lr at pcorp.us
Sat Oct 28 10:04:34 PDT 2017


Author: robe
Date: 2017-10-28 10:04:34 -0700 (Sat, 28 Oct 2017)
New Revision: 16073

Modified:
   trunk/liblwgeom/Makefile.in
   trunk/loader/Makefile.in
   trunk/raster/loader/Makefile.in
   trunk/utils/Makefile.in
Log:
Hard-code build-aux/install-sh in all install scripts 
instead of relying on @INSTALL@ to pick an install executable
on systems where @INSTALL@ resolves, ends up picking the system preferred install
which at least on mingw64 won't directories if they don't exist
in addition on mingw64, it doesn't 
even fill in @INSTALL@ with install unless AC_PROG_INSALL is included
References #3916 for PostGIS 2.5 (trunk)
References #3912 for PostGIS 2.5 (trunk)


Modified: trunk/liblwgeom/Makefile.in
===================================================================
--- trunk/liblwgeom/Makefile.in	2017-10-28 15:55:59 UTC (rev 16072)
+++ trunk/liblwgeom/Makefile.in	2017-10-28 17:04:34 UTC (rev 16073)
@@ -33,7 +33,7 @@
 libdir = @libdir@
 includedir = @includedir@
 SHELL = @SHELL@
-INSTALL = @INSTALL@
+INSTALL = $(SHELL) ../build-aux/install-sh
 LIBTOOL = @LIBTOOL@
 
 SOVER = @POSTGIS_MAJOR_VERSION at .@POSTGIS_MINOR_VERSION@

Modified: trunk/loader/Makefile.in
===================================================================
--- trunk/loader/Makefile.in	2017-10-28 15:55:59 UTC (rev 16072)
+++ trunk/loader/Makefile.in	2017-10-28 17:04:34 UTC (rev 16073)
@@ -25,7 +25,7 @@
 CFLAGS=-I ../liblwgeom @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ @PROJ_CPPFLAGS@
 top_builddir = @top_builddir@
 SHELL = @SHELL@
-INSTALL = @INSTALL@
+INSTALL = $(SHELL) ../build-aux/install-sh
 LIBTOOL = @LIBTOOL@
 
 # Filenames with extension as determined by the OS

Modified: trunk/raster/loader/Makefile.in
===================================================================
--- trunk/raster/loader/Makefile.in	2017-10-28 15:55:59 UTC (rev 16072)
+++ trunk/raster/loader/Makefile.in	2017-10-28 17:04:34 UTC (rev 16073)
@@ -25,7 +25,7 @@
 CC=@CC@
 top_builddir = @top_builddir@
 SHELL = @SHELL@
-INSTALL = @INSTALL@
+INSTALL = $(SHELL) ../../build-aux/install-sh
 LIBTOOL = @LIBTOOL@
 
 # Filenames with extension as determined by the OS

Modified: trunk/utils/Makefile.in
===================================================================
--- trunk/utils/Makefile.in	2017-10-28 15:55:59 UTC (rev 16072)
+++ trunk/utils/Makefile.in	2017-10-28 17:04:34 UTC (rev 16073)
@@ -26,7 +26,7 @@
 include $(PGXS)
 
 SHELL = @SHELL@
-INSTALL = @INSTALL@
+INSTALL = $(SHELL) ../build-aux/install-sh
 
 SCRIPTS_built = postgis_restore.pl
 



More information about the postgis-tickets mailing list