* 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.

diff --git a/ChangeLog b/ChangeLog
index f1dde43f90c86046688da690ab4de8cb42c3e759..0243b59d0f3ba752add8d3709972ee89cb802f0f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2001-08-03  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * 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  <tim.van.holder@pandora.be>
 
        * automake.texi (EXEEXT): Clarify.

diff --git a/m4/Makefile.am b/m4/Makefile.am
index f74cc4da509dff31e7fd595a2a61ed59b49721af..890a2483ee15af97085b7b4c9b04a4389e8272d9 100644 (file)
--- 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 5b06eb5f739127ed14a47b198bc1697166abce2f..c5fa8659d373adcbc7628c0c93a3ba9530dedc1a 100644 (file)
--- 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 0b6e78ee1fe4ed5dd5036e36c960f4b110a98553..724fbc7ab11b36c1d86973c9b18087fe73aa7cff 100644 (file)
--- 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 (file)
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 c35869e8f2f00b7ab4e9f802be1447fcd1a8349d..8f8d12db476cbd0e37e7d9b2ef12b5065097e0ce 100644 (file)
--- 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 5e8f1e5b0ea8f95f3493075a7ab59113afd55789..729f9150a00edecf82d6434c205c293605b70148 100644 (file)
--- 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])])