From f00ec2842b04fb937550074fdec93f0f81c83c80 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Fri, 3 Aug 2001 08:28:21 +0000 Subject: [PATCH] * 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. --- ChangeLog | 12 ++++++++++++ m4/Makefile.am | 8 ++++---- m4/Makefile.in | 8 ++++---- m4/init.m4 | 2 +- m4/install-sh.m4 | 7 +++++++ m4/missing.m4 | 19 ------------------- m4/strip.m4 | 5 ++--- 7 files changed, 30 insertions(+), 31 deletions(-) create mode 100644 m4/install-sh.m4 diff --git a/ChangeLog b/ChangeLog index f1dde43..0243b59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2001-08-03 Alexandre Duret-Lutz + + * 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. + 2001-08-02 Tim Van Holder * automake.texi (EXEEXT): Clarify. diff --git a/m4/Makefile.am b/m4/Makefile.am index f74cc4d..890a248 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -2,9 +2,9 @@ m4datadir = $(datadir)/aclocal m4data_DATA = as.m4 auxdir.m4 ccstdc.m4 cond.m4 depend.m4 depout.m4 \ -dmalloc.m4 error.m4 gcj.m4 header.m4 init.m4 lex.m4 lispdir.m4 make.m4 \ -maintainer.m4 minuso.m4 missing.m4 multi.m4 obstack.m4 protos.m4 \ -ptrdiff.m4 python.m4 regex.m4 sanity.m4 strip.m4 strtod.m4 termios.m4 \ -winsz.m4 +dmalloc.m4 error.m4 gcj.m4 header.m4 init.m4 install-sh.m4 lex.m4 \ +lispdir.m4 make.m4 maintainer.m4 minuso.m4 missing.m4 multi.m4 \ +obstack.m4 protos.m4 ptrdiff.m4 python.m4 regex.m4 sanity.m4 strip.m4 \ +strtod.m4 termios.m4 winsz.m4 EXTRA_DIST = $(m4data_DATA) diff --git a/m4/Makefile.in b/m4/Makefile.in index 5b06eb5..c5fa865 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -70,10 +70,10 @@ install_sh = @install_sh@ m4datadir = $(datadir)/aclocal m4data_DATA = as.m4 auxdir.m4 ccstdc.m4 cond.m4 depend.m4 depout.m4 \ -dmalloc.m4 error.m4 gcj.m4 header.m4 init.m4 lex.m4 lispdir.m4 make.m4 \ -maintainer.m4 minuso.m4 missing.m4 multi.m4 obstack.m4 protos.m4 \ -ptrdiff.m4 python.m4 regex.m4 sanity.m4 strip.m4 strtod.m4 termios.m4 \ -winsz.m4 +dmalloc.m4 error.m4 gcj.m4 header.m4 init.m4 install-sh.m4 lex.m4 \ +lispdir.m4 make.m4 maintainer.m4 minuso.m4 missing.m4 multi.m4 \ +obstack.m4 protos.m4 ptrdiff.m4 python.m4 regex.m4 sanity.m4 strip.m4 \ +strtod.m4 termios.m4 winsz.m4 EXTRA_DIST = $(m4data_DATA) diff --git a/m4/init.m4 b/m4/init.m4 index 0b6e78e..724fbc7 100644 --- a/m4/init.m4 +++ b/m4/init.m4 @@ -70,7 +70,7 @@ AM_MISSING_PROG(AUTOMAKE, automake) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) AM_MISSING_PROG(AMTAR, tar) -AM_MISSING_INSTALL_SH +AM_PROG_INSTALL_SH AM_PROG_INSTALL_STRIP # We need awk for the "check" target. The system "awk" is bad on # some platforms. diff --git a/m4/install-sh.m4 b/m4/install-sh.m4 new file mode 100644 index 0000000..0b0d1f0 --- /dev/null +++ b/m4/install-sh.m4 @@ -0,0 +1,7 @@ +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +install_sh=${install_sh-"$am_aux_dir/install-sh"} +AC_SUBST(install_sh)]) diff --git a/m4/missing.m4 b/m4/missing.m4 index c35869e..8f8d12d 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. diff --git a/m4/strip.m4 b/m4/strip.m4 index 5e8f1e5..729f915 100644 --- a/m4/strip.m4 +++ b/m4/strip.m4 @@ -6,7 +6,6 @@ # always use install-sh in `make install-strip', and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_MISSING_INSTALL_SH])dnl -_am_dirpart="`echo $install_sh | sed -e 's,//*[[^/]]*$,,'`" -INSTALL_STRIP_PROGRAM="\${SHELL} \`CDPATH=: && cd $_am_dirpart && pwd\`/install-sh -c -s" +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -- 2.7.4