Changes for cygwin that have been implemented on the other branches.

This commit is contained in:
Harry Moffat 2009-12-24 23:14:53 +00:00
parent d96464f0c2
commit c436da103e
4 changed files with 4418 additions and 7292 deletions

View file

@ -192,8 +192,8 @@ endif
finish-install:
@INSTALL@ -d @ct_docdir@
@INSTALL@ -d @ct_bindir@
cp -f bin/exp3to2.sh "@ct_bindir@"
cp -f bin/csvdiff "@ct_bindir@"
-( cd bin ; @INSTALL@ -c exp3to2.sh "@ct_bindir@" )
-( cd bin ; @INSTALL@ -c csvdiff "@ct_bindir@" )
ifeq ($(os_is_win),0)
# Commands to be executed for non-win systems
cp -f License.rtf "@ct_bindir@"

View file

@ -44,7 +44,7 @@ mkdirprog="${MKDIRPROG-mkdir}"
verbose=""
transformbasename=""
transform_arg=""
instcmd="$mvprog"
instcmd="$cpprog"
chmodcmd="$chmodprog 0755"
chowncmd=""
chgrpcmd=""
@ -57,10 +57,13 @@ dir_arg=""
while [ x"$1" != x ]; do
case $1 in
-c) instcmd="$cpprog"
shift
-c) shift
continue;;
-move) instcmd="$mvprog"
shift
continue;;
-d) dir_arg=true
shift
continue;;
@ -138,8 +141,8 @@ else
then
true
else
echo "install: $src does not exist"
exit 1
echo "install: WARNING $src does not exist"
exit 0
fi
if [ x"$dst" = x ]

11677
configure vendored

File diff suppressed because one or more lines are too long

View file

@ -1350,11 +1350,19 @@ AC_PROG_INSTALL
# doesn't have this problem. So, I changed the default
# install program to config/install-sh, which should work
# on all platforms since its a bourne shell script
# HKM 12/24/2009 - Ran into another problem with the new cygwin 1.7.1.
# THe install (and even cp -f in some cases) program will fail
# when an existing different file is in place. This occurs sometimes
# and I can not quite nail down when. However replacing
# the install command for cygwin. Note, install no longer
# needs to have a wildcard capability within Cantera.
case $ac_sys_system in
CYGWIN* )
INSTALL=${INSTALL_BIN:=config/install-sh}
echo 'INSTALL program has been set to ' $INSTALL;;
esac
# problem: install-sh does not handle wildcards in filename.
# commenting this out (DGG)
# INSTALL=${INSTALL_BIN:=config/install-sh}
echo 'INSTALL program has been set to ' $INSTALL
#
# precompile_headers still relevant?
#