* m4/missing.m4 (AM_MISSING_INSTALL_SH): Don't take argument.

	* m4/init.m4 (AM_INIT_AUTOMAKE): Don't pass argument to
	AM_MISSING_INSTALL_SH.
	* automake.in (scan_one_configure_file): Reverted previous
	change.

diff --git a/ChangeLog b/ChangeLog
index 50b854f..f13c3c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 1999-11-22  Tom Tromey  <tromey@cygnus.com>
 
+       * m4/missing.m4 (AM_MISSING_INSTALL_SH): Don't take argument.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Don't pass argument to
+       AM_MISSING_INSTALL_SH.
+       * automake.in (scan_one_configure_file): Reverted previous
+       change.
+
        * automake.in (scan_one_configure_file): Define `install_sh'
        configure variable when AM_INIT_AUTOMAKE seen.  Report from Jim
        Meyering.

diff --git a/automake.in b/automake.in
index 8b663ab..15ed221 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -4490,7 +4490,6 @@ sub scan_one_configure_file
            $seen_prog_install = 1;
            ($package_version = $1) =~ s/$AM_PACKAGE_VERSION_PATTERN/$1/o;
            $package_version_line = $.;
-           $configure_vars{'install_sh'} = $filename . ':' . $.;
        }
 
        # This is like AM_INIT_AUTOMAKE, but doesn't actually set the

diff --git a/m4/init.m4 b/m4/init.m4
index d8ddaa5..13509e2 100644 (file)
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -31,7 +31,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(install_sh)
+AM_MISSING_INSTALL_SH
 dnl We need awk for the "check" target.  The system "awk" is bad on
 dnl some platforms.
 AC_REQUIRE([AC_PROG_AWK])

diff --git a/m4/missing.m4 b/m4/missing.m4
index 6dcfcaf..3cfdf98 100644 (file)
--- a/m4/missing.m4
+++ b/m4/missing.m4
@@ -8,14 +8,14 @@ $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])
 
 dnl Like AM_MISSING_PROG, but only looks for install-sh.
-dnl AM_MISSING_INSTALL_SH(NAME)
+dnl AM_MISSING_INSTALL_SH()
 AC_DEFUN(AM_MISSING_INSTALL_SH, [
 AC_REQUIRE([AM_MISSING_HAS_RUN])
-if test -z "$1"; then
-   $1="${am_missing_run}install-sh"
-   test -f "$1" || $1="${am_missing_run}install.sh"
+if test -z "$install_sh"; then
+   install_sh="${am_missing_run}install-sh"
+   test -f "$install_sh" || install_sh="${am_missing_run}install.sh"
 fi
-AC_SUBST($1)])
+AC_SUBST(install_sh)])
 
 dnl AM_MISSING_HAS_RUN.
 dnl Define MISSING if not defined so far and test if it supports --run.