summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xautomake.in18
2 files changed, 14 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index b62f19d3f..d033f5c65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-13 Kevin Ryde <user42@zip.com.au>
+
+ * automake.in (am_install_var): Apply the $(EXEEXT) hack to
+ EXTRA_PROGRAMS as well as other _PROGRAMS.
+
2000-07-02 Jim Meyering <meyering@lucent.com>
* automake.in (scan_one_configure_file): Recognize AC_LIBOBJ.
diff --git a/automake.in b/automake.in
index 30d8ef728..66ed92d37 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 .=