aboutsummaryrefslogtreecommitdiff
path: root/winsup/cygwin
diff options
context:
space:
mode:
Diffstat (limited to 'winsup/cygwin')
-rw-r--r--winsup/cygwin/Makefile.in7
-rwxr-xr-xwinsup/cygwin/configure2
-rw-r--r--winsup/cygwin/configure.in2
3 files changed, 5 insertions, 6 deletions
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index 2be5a56..57facbb 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 3ee7e36..0a47025 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 6ffce51..2d1d583 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