From 56026f97378d6b3a54f485bd1e0b0609ba9b07f7 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 28 Mar 1997 00:32:44 +0000 Subject: [PATCH] do not define INSTALL_SCRIPT twice --- ChangeLog | 3 +++ automake.in | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) 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 + * 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; } -- 2.47.3