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.

diff --git a/ChangeLog b/ChangeLog
index b62f19d3fe4ccce85fa92eae38a94b7b37a99ce1..d033f5c6587a68bbe048a42d9c07cc7577d60e66 100644 (file)
--- 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 30d8ef728021ab70c7f8c88b755e7b81ca553999..66ed92d37904e11a66d1032cece9b9f729504a90 100755 (executable)
--- 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 .=