From eb6a0b7149cafddf5bdb2650d3035ebf107e1e75 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 14 Jul 2000 01:09:40 +0000 Subject: [PATCH] 2000-07-13 Kevin Ryde * automake.in (am_install_var): Apply the $(EXEEXT) hack to EXTRA_PROGRAMS as well as other _PROGRAMS. --- ChangeLog | 5 +++++ automake.in | 18 +++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index b62f19d..d033f5c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-07-13 Kevin Ryde + + * automake.in (am_install_var): Apply the $(EXEEXT) hack to + EXTRA_PROGRAMS as well as other _PROGRAMS. + 2000-07-02 Jim Meyering * automake.in (scan_one_configure_file): Recognize AC_LIBOBJ. diff --git a/automake.in b/automake.in index 30d8ef7..66ed92d 100755 --- a/automake.in +++ b/automake.in @@ -7188,15 +7188,6 @@ sub am_install_var push (@result, $rcurs); } - # "EXTRA" shouldn't be used when generating clean targets, - # all, or install targets. - if ($X eq 'EXTRA') - { - # We used to warn if EXTRA_FOO was defined uselessly, - # but this was annoying. - next; - } - # A blatant hack: we rewrite each _PROGRAMS primary to # include EXEEXT when in Cygwin32 mode. if ($seen_exeext && $primary eq 'PROGRAMS') @@ -7263,6 +7254,15 @@ sub am_install_var } } + # "EXTRA" shouldn't be used when generating clean targets, + # all, or install targets. + if ($X eq 'EXTRA') + { + # We used to warn if EXTRA_FOO was defined uselessly, + # but this was annoying. + next; + } + if ($do_clean) { $output_rules .= -- 2.7.4