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)

git-svn-id: http://svn.osgeo.org/postgis/trunk@16073 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/liblwgeom/Makefile.in b/liblwgeom/Makefile.in
index ac3b431c035ff8ad950061d7af0a9c6c12c160cb..b0171e649006ba526ee1104209514bd68b358633 100644 (file)
--- a/liblwgeom/Makefile.in
+++ b/liblwgeom/Makefile.in
@@ -33,7 +33,7 @@ exec_prefix = @exec_prefix@
 libdir = @libdir@
 includedir = @includedir@
 SHELL = @SHELL@
-INSTALL = @INSTALL@
+INSTALL = $(SHELL) ../build-aux/install-sh
 LIBTOOL = @LIBTOOL@
 
 SOVER = @POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@

diff --git a/loader/Makefile.in b/loader/Makefile.in
index 830db51c8fd14999e1599165f5d8d38cecc5e812..02d2827c3e94082873e420e3a90c287ffb921618 100644 (file)
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -25,7 +25,7 @@ CC=@CC@
 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

diff --git a/raster/loader/Makefile.in b/raster/loader/Makefile.in
index f7353dbe664cf7b6133f4861723823bed484e888..002b96789def47fb0407d8ffbc6a0ad9dbe526ca 100644 (file)
--- a/raster/loader/Makefile.in
+++ b/raster/loader/Makefile.in
@@ -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

diff --git a/utils/Makefile.in b/utils/Makefile.in
index 5ae76c0e7f38ea05c1f58c9f1cd400568505fed5..4d392289594ea2800b47208bf97b70d83cfea07f 100644 (file)
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -26,7 +26,7 @@ PGXS := @PGXS@
 include $(PGXS)
 
 SHELL = @SHELL@
-INSTALL = @INSTALL@
+INSTALL = $(SHELL) ../build-aux/install-sh
 
 SCRIPTS_built = postgis_restore.pl