Formerly acspecific.m4.~182~

diff --git a/acspecific.m4 b/acspecific.m4
index 10fc731087488ffafebae6c0f06bf608d8c99038..80c88e274c476cff026382db3322989e73ba0f24 100644 (file)
--- 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 10fc731087488ffafebae6c0f06bf608d8c99038..80c88e274c476cff026382db3322989e73ba0f24 100644 (file)
--- 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)'}