diff options
| author | Alexandre Duret-Lutz <adl@gnu.org> | 2001-08-03 08:28:21 +0000 |
|---|---|---|
| committer | Alexandre Duret-Lutz <adl@gnu.org> | 2001-08-03 08:28:21 +0000 |
| commit | f00ec2842b04fb937550074fdec93f0f81c83c80 (patch) | |
| tree | 530b6cd1c7c24a5de6745b92fc923f92f58c1fa6 /m4/missing.m4 | |
| parent | 56fc34a8be4778e505b162ebdb144f73df4f4c45 (diff) | |
| download | automake-f00ec2842b04fb937550074fdec93f0f81c83c80.tar.gz | |
* m4/install-sh.m4: New file.
* m4/Makefile.am (m4data_DATA): Add install-sh.m4.
* m4/missing.m4 (AM_MISSING_INSTALL_SH): Move ...
* m4/install-sh.m4 (AM_PROG_INSTALL_SH): ... here. Don't check
for install.sh any longer, always use install-sh, don't even
fall back to missing. Use $am_aux_dir, making $install_sh absolute.
* m4/strip.m4 (AM_PROG_INSTALL_STRIP): Simplify, since $install_sh
is absolute.
* m4/init.m4: Adjust call to AM_PROG_INSTALL_SH.
Diffstat (limited to 'm4/missing.m4')
| -rw-r--r-- | m4/missing.m4 | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/m4/missing.m4 b/m4/missing.m4 index c35869e8f..8f8d12db4 100644 --- a/m4/missing.m4 +++ b/m4/missing.m4 @@ -12,25 +12,6 @@ $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) -# AM_MISSING_INSTALL_SH -# --------------------- -# Like AM_MISSING_PROG, but only looks for install-sh. -AC_DEFUN([AM_MISSING_INSTALL_SH], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -if test -z "$install_sh"; then - for install_sh in "$ac_aux_dir/install-sh" \ - "$ac_aux_dir/install.sh" \ - "${am_missing_run}${ac_aux_dir}/install-sh"; - do - test -f "$install_sh" && break - done - # FIXME: an evil hack: we remove the SHELL invocation from - # install_sh because automake adds it back in. Sigh. - install_sh=`echo $install_sh | sed -e 's/\${SHELL}//'` -fi -AC_SUBST(install_sh)]) - - # AM_MISSING_HAS_RUN # ------------------ # Define MISSING if not defined so far and test if it supports --run. |