From: Simon Josefsson <simon@josefsson.org>
Date: Tue, 28 Oct 2008 10:04:35 +0000 (+0100)
Subject: argp: Use standard gnulib idiom for EXEEXT.
X-Git-Tag: v0.1~6753
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=fb150740d1e516cf8fdd1effe7b1f6556471b418;p=gnulib.git

argp: Use standard gnulib idiom for EXEEXT.
---

diff --git a/ChangeLog b/ChangeLog
index 606e3a859..2b3c23b25 100644
--- 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 c6d9dc152..b0f4c1884 100755
--- 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 8f92a4def..8879cceea 100644
--- 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@