[postgis-tickets] r16083 - change back to using @INSTALL@ and put in AC_PROG_INSTALL
Regina Obe
lr at pcorp.us
Mon Oct 30 13:34:37 PDT 2017
Author: robe
Date: 2017-10-30 13:34:36 -0700 (Mon, 30 Oct 2017)
New Revision: 16083
Modified:
trunk/configure.ac
trunk/liblwgeom/Makefile.in
trunk/loader/Makefile.in
trunk/raster/loader/Makefile.in
Log:
change back to using @INSTALL@ and put in AC_PROG_INSTALL
so install doesn't go to ../ for insall on mingw
References #3916
References #3912
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2017-10-30 20:26:52 UTC (rev 16082)
+++ trunk/configure.ac 2017-10-30 20:34:36 UTC (rev 16083)
@@ -13,6 +13,7 @@
AC_CONFIG_HEADERS([postgis_config.h])
AC_CONFIG_MACRO_DIR([macros])
AC_CONFIG_AUX_DIR([build-aux])
+AC_PROG_INSTALL
dnl Invoke libtool: we do this as it is the easiest way to find the PIC
Modified: trunk/liblwgeom/Makefile.in
===================================================================
--- trunk/liblwgeom/Makefile.in 2017-10-30 20:26:52 UTC (rev 16082)
+++ trunk/liblwgeom/Makefile.in 2017-10-30 20:34:36 UTC (rev 16083)
@@ -33,7 +33,7 @@
libdir = @libdir@
includedir = @includedir@
SHELL = @SHELL@
-INSTALL = $(SHELL) ../build-aux/install-sh
+INSTALL = @INSTALL@
LIBTOOL = @LIBTOOL@
SOVER = @POSTGIS_MAJOR_VERSION at .@POSTGIS_MINOR_VERSION@
Modified: trunk/loader/Makefile.in
===================================================================
--- trunk/loader/Makefile.in 2017-10-30 20:26:52 UTC (rev 16082)
+++ trunk/loader/Makefile.in 2017-10-30 20:34:36 UTC (rev 16083)
@@ -25,7 +25,7 @@
CFLAGS=-I ../liblwgeom @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ @PROJ_CPPFLAGS@
top_builddir = @top_builddir@
SHELL = @SHELL@
-INSTALL = $(SHELL) ../build-aux/install-sh
+INSTALL = @INSTALL@
LIBTOOL = @LIBTOOL@
# Filenames with extension as determined by the OS
Modified: trunk/raster/loader/Makefile.in
===================================================================
--- trunk/raster/loader/Makefile.in 2017-10-30 20:26:52 UTC (rev 16082)
+++ trunk/raster/loader/Makefile.in 2017-10-30 20:34:36 UTC (rev 16083)
@@ -25,7 +25,7 @@
CC=@CC@
top_builddir = @top_builddir@
SHELL = @SHELL@
-INSTALL = $(SHELL) ../../build-aux/install-sh
+INSTALL = @INSTALL@
LIBTOOL = @LIBTOOL@
# Filenames with extension as determined by the OS
More information about the postgis-tickets
mailing list