* tests/Makefile.am (XFAIL_TESTS): Removed exeext.test.

	* automake.in (am_install_var): Add $(EXEEXT) even if program name
	holds `.'.  Don't add $(EXEEXT) if program name already has it.
	(handle_programs): Don't add $(EXEEXT) if user already did.
	(make_paragraphs): Don't compute EXEEXT.

diff --git a/ChangeLog b/ChangeLog
index c3a7ac1d473888a6737a6125d940794d32038d27..8b678033c9b487813662d01d606488b6aeaf8e15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,18 @@
 2001-07-22  Tom Tromey  <tromey@redhat.com>
 
+       * tests/Makefile.am (XFAIL_TESTS): Removed exeext.test.
+       * automake.in (am_install_var): Add $(EXEEXT) even if program name
+       holds `.'.  Don't add $(EXEEXT) if program name already has it.
+       (handle_programs): Don't add $(EXEEXT) if user already did.
+       (make_paragraphs): Don't compute EXEEXT.
+
        * tests/Makefile.am (TESTS): Added exeext.test.
        (XFAIL_TESTS): Likewise.
        * tests/exeext.test: New file.
 
 2001-07-22  Tom Tromey  <tromey@redhat.com>
 
-       * lib/am/progs.am (install-%DIR%PROGRAMS): Test for `prog, not
+       * lib/am/progs.am (install-%DIR%PROGRAMS): Test for `prog', not
        `prog.exe' on Cygwin with libtool.  From Robert Collins.
 
 2001-07-21  Tim Van Holder  <tim.van.holder@pandora.be>

diff --git a/automake.in b/automake.in
index ffeb2621f9c6b37788f8ea2074396f6561d28957..9b21517a1b8ab212e96f748a94f7f7ff7f0bbb08 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2462,11 +2462,17 @@ sub handle_programs
        # make sure this directory will exist.
        my $dirstamp = &require_build_directory_maybe ($one_file);
 
+       # Don't add $(EXEEXT) if user already did.
+       my $extension = (($seen_exeext && $one_file !~ /\$\(EXEEXT\)$/)
+                        ? "\$(EXEEXT)"
+                        : '');
+
        $output_rules .= &file_contents ('program',
                                         ('PROGRAM'  => $one_file,
                                          'XPROGRAM' => $xname,
                                          'XLINK'    => $xlink,
-                                         'DIRSTAMP' => $dirstamp));
+                                         'DIRSTAMP' => $dirstamp,
+                                         'EXEEXT'   => $extension));
     }
 
     if (&variable_defined ('LDADD') && &handle_lib_objects ('', 'LDADD'))
@@ -6815,8 +6821,6 @@ sub make_paragraphs ($%)
                     'HOST'     => $seen_canonical,
                     'TARGET'   => $seen_canonical == $AC_CANONICAL_SYSTEM,
 
-                    'EXEEXT'   => ($seen_exeext ? '$(EXEEXT)' : ''),
-
                     'LIBTOOL'      => defined $configure_vars{'LIBTOOL'})
          # We don't need more than two consecutive new-lines.
          . 's/\n{3,}/\n\n/g';
@@ -7278,39 +7282,41 @@ sub am_install_var
        # when it isn't available.  However, it isn't that simple.
        # See nolink.test.
        if ($seen_exeext && $primary eq 'PROGRAMS')
-         {
+       {
            my @conds = &variable_conditions ($one_name);
 
            my @condvals;
            foreach my $cond (@conds)
-             {
+           {
                my @one_binlist = ();
                my @condval = &variable_value_as_list ($one_name,
                                                       $cond);
                foreach my $rcurs (@condval)
-                 {
-                   if ($rcurs =~ /\./ || $rcurs =~ /^\@.*\@$/)
-                     {
+               {
+                   # Skip autoconf substs.  Also skip if the user
+                   # already applied $(EXEEXT).
+                   if ($rcurs =~ /^\@.*\@$/ || $rcurs =~ /\$\(EXEEXT\)$/)
+                   {
                        push (@one_binlist, $rcurs);
-                     }
+                   }
                    else
-                     {
+                   {
                        push (@one_binlist, $rcurs . '$(EXEEXT)');
-                     }
-                 }
+                   }
+               }
 
                push (@condvals, $cond);
                push (@condvals, join (' ', @one_binlist));
-             }
+           }
 
            variable_delete ($one_name);
            while (@condvals)
-             {
+           {
                my $cond = shift (@condvals);
                my @val = split (' ', shift (@condvals));
                &define_pretty_variable ($one_name, $cond, @val);
-             }
-         }
+           }
+       }
 
        # "EXTRA" shouldn't be used when generating clean targets,
        # all, or install targets.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f9555df86592b05c8ba912fc02cf5376d86d159e..6c3cc28cbc94c9b3ae2b63ad1868f8341832c2f5 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to create Makefile.in
 
-XFAIL_TESTS = subdir5.test substtarg.test exeext.test
+XFAIL_TESTS = subdir5.test substtarg.test
 
 TESTS =        \
 acinclude.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index ab82589b6c5013087ea2c80e4d7bcfb7674f56ff..458c6146c84a751fe38b4e3a46b44c175d0ac6bb 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -66,7 +66,7 @@ _am_include = @_am_include@
 _am_quote = @_am_quote@
 install_sh = @install_sh@
 
-XFAIL_TESTS = subdir5.test substtarg.test exeext.test
+XFAIL_TESTS = subdir5.test substtarg.test
 
 TESTS = \
 acinclude.test \
@@ -383,6 +383,8 @@ yaccvpath.test
 
 
 EXTRA_DIST = defs ChangeLog-old $(TESTS)
+EXEEXT =
+OBJEXT = o
 subdir = tests
 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs
 CONFIG_CLEAN_FILES =