Module: wine Branch: master Commit: 6af2d29f4ead3f12fbd94167fe6940368488f332 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6af2d29f4ead3f12fbd94167fe...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Dec 26 14:28:30 2013 +0100
configure: Always use the local install-sh script for installing.
---
configure | 95 +++------------------------------------------------------ configure.ac | 6 ++- 2 files changed, 9 insertions(+), 92 deletions(-)
diff --git a/configure b/configure index f9b91aa..8aa722d 100755 --- a/configure +++ b/configure @@ -728,6 +728,7 @@ FONTFORGE INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM +INSTALL LDCONFIG MKDIR_P EGREP @@ -5447,99 +5448,13 @@ fi
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM="STRIPPROG="$(STRIP)" $(top_srcdir)/tools/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 -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } -if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in #(( - ./ | .// | /[cC]/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:[\/]os2[\/]install[\/]* | ?:[\/]OS2[\/]INSTALL[\/]* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - fi - done - done - ;; -esac - - done -IFS=$as_save_IFS - -rm -rf conftest.one conftest.two conftest.dir - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } +test -z "$INSTALL" && INSTALL="$(top_srcdir)/tools/install-sh"
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM="STRIPPROG="$(STRIP)" $(INSTALL)"
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT="$(INSTALL)"
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +test -z "$INSTALL_DATA" && INSTALL_DATA="$(INSTALL) -m 644"
for ac_prog in fontforge diff --git a/configure.ac b/configure.ac index 94b1e29..bbf8258 100644 --- a/configure.ac +++ b/configure.ac @@ -266,8 +266,10 @@ AC_PROG_MKDIR_P AC_PATH_PROG(LDCONFIG, ldconfig, true, [/sbin /usr/sbin $PATH])
dnl Use the correct strip to install programs -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM="STRIPPROG="$(STRIP)" $(top_srcdir)/tools/install-sh" -AC_PROG_INSTALL +test -z "$INSTALL" && AC_SUBST([INSTALL],"$(top_srcdir)/tools/install-sh") +test -z "$INSTALL_PROGRAM" && AC_SUBST([INSTALL_PROGRAM],"STRIPPROG="$(STRIP)" $(INSTALL)") +test -z "$INSTALL_SCRIPT" && AC_SUBST([INSTALL_SCRIPT],"$(INSTALL)") +test -z "$INSTALL_DATA" && AC_SUBST([INSTALL_DATA],"$(INSTALL) -m 644")
dnl Check for various programs AC_CHECK_PROGS(FONTFORGE, fontforge, false)