do not define INSTALL_SCRIPT twice

diff --git a/ChangeLog b/ChangeLog
index 0cfafee779327ab52b1b6ab3b63e29579db64b74..d02fce9987611c715623d7e399af0d3500834b7f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Thu Mar 27 17:28:47 1997  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (scan_one_configure_file): Explicitly avoid
+       INSTALL_SCRIPT to avoid defining it twice.
+
        * header-vars.am: Change _INSTALL variable definitions to `true'.
        Updated all users to put `@' before invocation.
 

diff --git a/automake.in b/automake.in
index e450f9ae505b7c428c7da88cab7ebaaf630802b7..6de55ef21ca914255d15dd3e19c2fa791ca97278 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -3762,8 +3762,12 @@ sub scan_one_configure_file
        }
 
        # Explicitly avoid ANSI2KNR -- we AC_SUBST that in protos.m4,
-       # but later define it elsewhere.  This is pretty hacky.
-       if (/$AC_SUBST_PATTERN/o && $1 ne 'ANSI2KNR')
+       # but later define it elsewhere.  This is pretty hacky.  We
+       # also explicitly avoid INSTALL_SCRIPT because it is defined
+       # in header-vars.am.  FIXME.
+       if (/$AC_SUBST_PATTERN/o
+           && $1 ne 'ANSI2KNR'
+           && $1 ne 'INSTALL_SCRIPT')
        {
            $configure_vars{$1} = 1;
        }