aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeoffrey Noer <noer@cygnus>1998-07-14 22:40:44 +0000
committerGeoffrey Noer <noer@cygnus>1998-07-14 22:40:44 +0000
commit098189d402229848cdb61b1f3610687e82f5d8f4 (patch)
treeff43a90d4311196e9e76a172bf39a9ca5a9fd3b5
parentd51be0a936f3209927f1087c603867570b596c6c (diff)
downloadgdb-098189d402229848cdb61b1f3610687e82f5d8f4.zip
gdb-098189d402229848cdb61b1f3610687e82f5d8f4.tar.gz
gdb-098189d402229848cdb61b1f3610687e82f5d8f4.tar.bz2
Tue Jul 14 15:37:41 1998 Geoffrey Noer <noer@cygnus.com>
* configure.in: Win32 hosts shouldn't use install -x * install-sh: remove -x option, and special .exe-handling hack.
-rw-r--r--configure.in11
-rwxr-xr-xinstall-sh36
2 files changed, 1 insertions, 46 deletions
diff --git a/configure.in b/configure.in
index 9b0bf4d..be6bd69 100644
--- a/configure.in
+++ b/configure.in
@@ -1129,17 +1129,6 @@ if [ "${shared}" = "yes" ]; then
esac
fi
-# If we are building for a win32 host, then set INSTALL_PROGRAM_ARGS to
-# -x. This will cause programs to be installed with .exe extensions.
-case "${host}" in
-*-*-cygwin32* | i[3456]86-*-mingw32)
- sed -e 's/^INSTALL_PROGRAM_ARGS[ ]*=.*$/INSTALL_PROGRAM_ARGS = -x/' \
- Makefile > Makefile.tem
- rm -f Makefile
- mv -f Makefile.tem Makefile
- ;;
-esac
-
# Record target_configdirs and the configure arguments in Makefile.
target_configdirs=`echo "${target_configdirs}" | sed -e 's/target-//g'`
targargs=`echo "${arguments}" | \
diff --git a/install-sh b/install-sh
index 1eeabbe..dd099dc 100755
--- a/install-sh
+++ b/install-sh
@@ -53,9 +53,6 @@ mvcmd="$mvprog"
src=""
dst=""
dir_arg=""
-# CYGNUS LOCAL: exeext variable
-exeext=""
-# END CYGNUS LOCAL
while [ x"$1" != x ]; do
case $1 in
@@ -94,16 +91,6 @@ while [ x"$1" != x ]; do
shift
continue;;
- # CYGNUS LOCAL: -x option
- -x=*) exeext=`echo $1 | sed 's/-x=//'`
- shift
- continue;;
-
- -x) exeext=".exe"
- shift
- continue;;
- # END CYGNUS LOCAL
-
*) if [ x"$src" = x ]
then
src=$1
@@ -131,27 +118,12 @@ if [ x"$dir_arg" != x ]; then
if [ -d $dst ]; then
instcmd=:
+ chmodcmd=""
else
instcmd=mkdir
fi
else
-# CYGNUS LOCAL noer
-# Win32-based gcc automatically appends .exe to produced executables,
-# whether asked for or not. This breaks installs. The following
-# changes the value of $src to $src.exe if $src is missing
-
- if [ -f $src ]
- then
- true
- elif [ -f $src.exe ]
- then
- echo "install: $src does not exist, trying with .exe appended"
- src="$src".exe
- fi
-
-# end CYGNUS LOCAL noer
-
# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
@@ -182,12 +154,6 @@ else
true
fi
- # CYGNUS LOCAL: Use exeext
- case "`basename $dst`" in
- *.*) ;;
- *) dst="$dst$exeext" ;;
- esac
- # END CYGNUS LOCAL
fi
## this sed command emulates the dirname command