argp: Use standard gnulib idiom for EXEEXT.

diff --git a/ChangeLog b/ChangeLog
index 606e3a85979cc7800e2be316012b289542c5c965..2b3c23b25d4436e97a85b88deb79ede6fdacdaf8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-28  Simon Josefsson  <simon@josefsson.org>
+
+       * gnulib-tool (func_emit_tests_Makefile_am): Revert last commit.
+       * modules/argp-tests (test_argp_LDADD): Set EXEEXT here instead,
+       using idiom used elsewhere in gnulib.
+
 2008-10-27  Jim Meyering  <meyering@redhat.com>
 
        * modules/gethostname (License): Relicense: LGPL -> LGPLv2+.

diff --git a/gnulib-tool b/gnulib-tool
index c6d9dc152c173a1f2737f0b2d81e85f9f3f35243..b0f4c1884e2fdd0b54a434248f801373effaf95b 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -2012,7 +2012,7 @@ func_emit_tests_Makefile_am ()
   #   "AM_GNU_GETTEXT used but SUBDIRS not defined"
   echo "SUBDIRS ="
   echo "TESTS ="
-  echo "TESTS_ENVIRONMENT = EXEEXT=\$(EXEEXT)"
+  echo "TESTS_ENVIRONMENT ="
   echo "noinst_PROGRAMS ="
   if ! $for_test; then
     echo "check_PROGRAMS ="

diff --git a/modules/argp-tests b/modules/argp-tests
index 8f92a4def71a39ddde108a86a0d75e20d4040926..8879cceeae516efbf3a1d2d6d1790e2fabb7691b 100644 (file)
--- a/modules/argp-tests
+++ b/modules/argp-tests
@@ -7,5 +7,6 @@ progname
 
 Makefile.am:
 TESTS += test-argp test-argp-2.sh
+TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
 check_PROGRAMS += test-argp
 test_argp_LDADD = $(LDADD) @LIBINTL@