summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>1999-12-10 07:49:33 +0000
committerTom Tromey <tromey@redhat.com>1999-12-10 07:49:33 +0000
commita9e06855b7600a78cf2c191cca3a43d41137e8aa (patch)
treec7ed36e6e3937026aeb7e162c3c654f0a66983fd /m4
parentfc9b641e200357b61bb445c17e4734c539b75db4 (diff)
downloadautomake-a9e06855b7600a78cf2c191cca3a43d41137e8aa.tar.gz
* automake.in (initialize_global_constants): If unreadable by
owner, make it readable by owner regardless of number of links. Fixes more of install2.test. * missing: Try to see if gnutar or gtar exist before invoking them. * m4/missing.m4 (AM_MISSING_INSTALL_SH): Remove ${SHELL} from install_sh value. Look for install-sh and install.sh in a somewhat more sensible way. Fixes test install2.test. Partially from Jim Meyering.
Diffstat (limited to 'm4')
-rw-r--r--m4/missing.m48
1 files changed, 6 insertions, 2 deletions
diff --git a/m4/missing.m4 b/m4/missing.m4
index 5daa79448..02cfc8abc 100644
--- a/m4/missing.m4
+++ b/m4/missing.m4
@@ -12,8 +12,12 @@ dnl AM_MISSING_INSTALL_SH()
AC_DEFUN(AM_MISSING_INSTALL_SH, [
AC_REQUIRE([AM_MISSING_HAS_RUN])
if test -z "$install_sh"; then
- install_sh="${am_missing_run}install-sh"
- test -f "$install_sh" || install_sh="${am_missing_run}install.sh"
+ install_sh="$ac_aux_dir/install-sh"
+ test -f "$install_sh" || install_sh="$ac_aux_dir/install.sh"
+ test -f "$install_sh" || install_sh="${am_missing_run}${ac_auxdir}/install-sh"
+ dnl FIXME: an evil hack: we remove the SHELL invocation from
+ dnl install_sh because automake adds it back in. Sigh.
+ install_sh="`echo $install_sh | sed -e 's/\${SHELL}//'`"
fi
AC_SUBST(install_sh)])