From: Tom Tromey <tromey@redhat.com>
Date: Fri, 28 Mar 1997 00:32:44 +0000 (+0000)
Subject: do not define INSTALL_SCRIPT twice
X-Git-Tag: pre-ian-conditionals~52
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=56026f97378d6b3a54f485bd1e0b0609ba9b07f7;p=thirdparty%2Fautomake.git

do not define INSTALL_SCRIPT twice
---

diff --git a/ChangeLog b/ChangeLog
index 0cfafee77..d02fce998 100644
--- 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 e450f9ae5..6de55ef21 100755
--- 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;
 	}