From f7624975b02872fb47d925fb5821583aa9a3af35 Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Sun, 2 Feb 2003 17:07:59 +0000
Subject: [PATCH] * automake.in (handle_programs): Strip $(EXEEXT) before
 calling &check_canonical_spelling. * tests/exeext.test: Make sure we don't
 use a maude3__EXEEXT__OBJECTS variable.

---
 ChangeLog         | 7 +++++++
 automake.in       | 9 +++++----
 tests/exeext.test | 3 +++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8e21cfec..4d06ae81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-02  Alexandre Duret-Lutz  <adl@gnu.org>
+
+	* automake.in (handle_programs): Strip $(EXEEXT) before
+	calling &check_canonical_spelling.
+	* tests/exeext.test: Make sure we don't use a
+	maude3__EXEEXT__OBJECTS variable.
+
 2003-02-02  Jeremy Nimmer  <jwnimmer@alum.mit.edu>  (tiny change)
 
 	For Debian Bug #39542:
diff --git a/automake.in b/automake.in
index 1aed7db4..77c1287a 100755
--- a/automake.in
+++ b/automake.in
@@ -3202,6 +3202,11 @@ sub handle_programs
       my $seen_libobjs = 0;
       my $obj = &get_object_extension ($one_file);
 
+      # Strip any $(EXEEXT) suffix the user might have added, or this
+      # will confuse &handle_source_transform and &check_canonical_spelling.
+      # We'll add $(EXEEXT) back later anyway.
+      $one_file =~ s/\$\(EXEEXT\)$//;
+
       # Canonicalize names and check for misspellings.
       my $xname = &check_canonical_spelling ($one_file, '_LDADD', '_LDFLAGS',
 					     '_SOURCES', '_OBJECTS',
@@ -3210,10 +3215,6 @@ sub handle_programs
       $where->push_context ("while processing program `$one_file'");
       $where->set (INTERNAL->get);
 
-      # Strip any $(EXEEXT) suffix the user might have added, or this
-      # will confuse &handle_source_transform.  We'll add $(EXEEXT) back
-      # later anyway.
-      $one_file =~ s/\$\(EXEEXT\)$//;
       my $linker = &handle_source_transform ($xname, $one_file, $obj, $where);
 
       my $xt = '';
diff --git a/tests/exeext.test b/tests/exeext.test
index e7a2c3b7..145b5371 100755
--- a/tests/exeext.test
+++ b/tests/exeext.test
@@ -66,6 +66,9 @@ grep '^maude3$(EXEEXT):' Makefile.in
 grep '^mt$(EXEEXT):' Makefile.in
 grep '^rmt$(EXEEXT):' Makefile.in
 
+# Make sure $(EXEEXT) gets stripped before canonicalization.
+grep 'maude3__EXEEXT__OBJECTS' Makefile.in && exit 1
+
 ./configure
 
 EXEEXT=.foo $MAKE -e print > stdout
-- 
2.43.5