From: David MacKenzie Date: Thu, 18 Nov 1993 23:35:09 +0000 (+0000) Subject: Formerly acspecific.m4.~182~ X-Git-Tag: fsf-origin~826 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c3d690a3b93cdcbd02e3f2d23b6106a891b5074;p=thirdparty%2Fautoconf.git Formerly acspecific.m4.~182~ --- diff --git a/acspecific.m4 b/acspecific.m4 index 10fc73108..80c88e274 100644 --- a/acspecific.m4 +++ b/acspecific.m4 @@ -181,7 +181,16 @@ if test "z${INSTALL}" = "z" ; then done IFS="$saveifs" fi -INSTALL=${INSTALL-cp} +if test -z "$INSTALL"; then + if test -f ${srcdir}/install.sh; then + # We want the top-level source directory, not the subdir's srcdir, + # so expand srcdir now rather than in the Makefile. + INSTALL="${srcdir}/install.sh -c" + else + echo "warning: ${srcdir}/install.sh not found; using cp" + INSTALL=cp + fi +fi AC_SUBST(INSTALL)dnl test -n "$verbose" && echo " setting INSTALL to $INSTALL" INSTALL_PROGRAM=${INSTALL_PROGRAM-'$(INSTALL)'} diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4 index 10fc73108..80c88e274 100644 --- a/lib/autoconf/specific.m4 +++ b/lib/autoconf/specific.m4 @@ -181,7 +181,16 @@ if test "z${INSTALL}" = "z" ; then done IFS="$saveifs" fi -INSTALL=${INSTALL-cp} +if test -z "$INSTALL"; then + if test -f ${srcdir}/install.sh; then + # We want the top-level source directory, not the subdir's srcdir, + # so expand srcdir now rather than in the Makefile. + INSTALL="${srcdir}/install.sh -c" + else + echo "warning: ${srcdir}/install.sh not found; using cp" + INSTALL=cp + fi +fi AC_SUBST(INSTALL)dnl test -n "$verbose" && echo " setting INSTALL to $INSTALL" INSTALL_PROGRAM=${INSTALL_PROGRAM-'$(INSTALL)'}