diff options
| -rw-r--r-- | winsup/cygwin/Makefile.in | 7 | ||||
| -rwxr-xr-x | winsup/cygwin/configure | 2 | ||||
| -rw-r--r-- | winsup/cygwin/configure.in | 2 | ||||
| -rw-r--r-- | winsup/utils/Makefile.in | 6 | ||||
| -rwxr-xr-x | winsup/utils/configure | 2 | ||||
| -rw-r--r-- | winsup/utils/configure.in | 2 |
6 files changed, 10 insertions, 11 deletions
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in index 2be5a565f..57facbb9d 100644 --- a/winsup/cygwin/Makefile.in +++ b/winsup/cygwin/Makefile.in @@ -38,8 +38,9 @@ datadir:=@datadir@ infodir:=@infodir@ includedir:=@includedir@ -INSTALL:=@INSTALL@ -INSTALL_PROGRAM:=@INSTALL_PROGRAM@ +override INSTALL:=@INSTALL@ +override INSTALL_PROGRAM:=@INSTALL_PROGRAM@ +override INSTALL_DATA:=@INSTALL_DATA@ # # --enable options from configure @@ -96,8 +97,6 @@ LDSCRIPT:=cygwin.sc # include $(srcdir)/../Makefile.common -INSTALL_DATA:=$(SHELL) $(updir1)/install-sh -c - @SET_MAKE@ # Setup the testing framework, if you have one diff --git a/winsup/cygwin/configure b/winsup/cygwin/configure index 3ee7e3649..0a470252e 100755 --- a/winsup/cygwin/configure +++ b/winsup/cygwin/configure @@ -533,7 +533,7 @@ fi -INSTALL=`cd $srcdir/../..; echo $(pwd)/install-sh` +INSTALL="/bin/sh "`cd $srcdir/../..; echo $(pwd)/install-sh` ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do diff --git a/winsup/cygwin/configure.in b/winsup/cygwin/configure.in index 6ffce51f2..2d1d58321 100644 --- a/winsup/cygwin/configure.in +++ b/winsup/cygwin/configure.in @@ -13,7 +13,7 @@ AC_PREREQ(2.12)dnl AC_INIT(init.cc) AC_CONFIG_HEADER(config.h) -INSTALL=`cd $srcdir/../..; echo $(pwd)/install-sh` +INSTALL="/bin/sh "`cd $srcdir/../..; echo $(pwd)/install-sh` AC_PROG_INSTALL diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in index 4c897dca2..a52d48fca 100644 --- a/winsup/utils/Makefile.in +++ b/winsup/utils/Makefile.in @@ -18,9 +18,9 @@ bindir:=@bindir@ etcdir:=$(exec_prefix)/etc program_transform_name:=@program_transform_name@ -INSTALL:=@INSTALL@ -INSTALL_PROGRAM:=@INSTALL_PROGRAM@ -INSTALL_DATA:=@INSTALL_DATA@ +override INSTALL:=@INSTALL@ +override INSTALL_PROGRAM:=@INSTALL_PROGRAM@ +override INSTALL_DATA:=@INSTALL_DATA@ EXEEXT:=@EXEEXT@ EXEEXT_FOR_BUILD:=@EXEEXT_FOR_BUILD@ diff --git a/winsup/utils/configure b/winsup/utils/configure index b3ec82468..aeeb49192 100755 --- a/winsup/utils/configure +++ b/winsup/utils/configure @@ -951,7 +951,7 @@ if test "x$cross_compiling" = "xyes"; then fi fi -INSTALL=`cd $srcdir/../..; echo $(pwd)/install-sh` +INSTALL="/bin/sh "`cd $srcdir/../..; echo $(pwd)/install-sh` # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or diff --git a/winsup/utils/configure.in b/winsup/utils/configure.in index 486270c48..95421a86e 100644 --- a/winsup/utils/configure.in +++ b/winsup/utils/configure.in @@ -83,7 +83,7 @@ if test "x$cross_compiling" = "xyes"; then fi fi -INSTALL=`cd $srcdir/../..; echo $(pwd)/install-sh` +INSTALL="/bin/sh "`cd $srcdir/../..; echo $(pwd)/install-sh` AC_PROG_INSTALL |