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.
This commit is contained in:
parent
d51be0a936
commit
098189d402
2 changed files with 1 additions and 46 deletions
11
configure.in
11
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}" | \
|
||||
|
|
36
install-sh
36
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
|
||||
|
|
Loading…
Reference in a new issue