From ed28254b423b7c943bd08514dde8fe10d6f6d6ef Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Sat, 28 Oct 2017 17:04:34 +0000 Subject: [PATCH] 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 --- liblwgeom/Makefile.in | 2 +- loader/Makefile.in | 2 +- raster/loader/Makefile.in | 2 +- utils/Makefile.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/liblwgeom/Makefile.in b/liblwgeom/Makefile.in index ac3b431c0..b0171e649 100644 --- 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 830db51c8..02d2827c3 100644 --- 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 f7353dbe6..002b96789 100644 --- 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 5ae76c0e7..4d3922895 100644 --- 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 -- 2.40.0