From: Jim Meyering <meyering@redhat.com>
Date: Sun, 1 Jan 2012 16:51:36 +0000 (+0100)
Subject: test-framework-sh: init.sh: fix "make dist" failure
X-Git-Tag: v0.1~1323
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=15d2d3297af494d59a3c108a4a15bf71592678a8;p=gnulib.git

test-framework-sh: init.sh: fix "make dist" failure

When using gnulib-tool's --with-tests option and any module that
depends on test-framework-sh, "make dist" would fail due to the
lack of init.sh *in lib/*.  The EXTRA_DIST += init.sh is required
in the gltests directory, and not in the gllib/ directory.
One way to work around that is to move the EXTRA_DIST += init.sh
from the primary module to the -tests one:
* modules/test-framework-sh-tests (EXTRA_DIST): Add init.sh here, ...
* modules/test-framework-sh (Makefile.am): ...not here.
Reported by Tom G. Christensen in
http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/29519
---

diff --git a/ChangeLog b/ChangeLog
index 185c64dfc..ccc923b9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2012-01-01  Jim Meyering  <meyering@redhat.com>
 
+	test-framework-sh: init.sh: fix "make dist" failure
+	When using gnulib-tool's --with-tests option and any module that
+	depends on test-framework-sh, "make dist" would fail due to the
+	lack of init.sh *in lib/*.  The EXTRA_DIST += init.sh is required
+	in the gltests directory, and not in the gllib/ directory.
+	One way to work around that is to move the EXTRA_DIST += init.sh
+	from the primary module to the -tests one:
+	* modules/test-framework-sh-tests (EXTRA_DIST): Add init.sh here, ...
+	* modules/test-framework-sh (Makefile.am): ...not here.
+	Reported by Tom G. Christensen in
+	http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/29519
+
 	version-etc: update copyright year reported by --version
 	* lib/version-etc.c (COPYRIGHT_YEAR): Update to 2012.
 
diff --git a/modules/test-framework-sh b/modules/test-framework-sh
index ee913a475..249f42660 100644
--- a/modules/test-framework-sh
+++ b/modules/test-framework-sh
@@ -9,7 +9,6 @@ Depends-on:
 configure.ac:
 
 Makefile.am:
-EXTRA_DIST += init.sh
 
 Include:
 
diff --git a/modules/test-framework-sh-tests b/modules/test-framework-sh-tests
index 17dff9e37..38570f49e 100644
--- a/modules/test-framework-sh-tests
+++ b/modules/test-framework-sh-tests
@@ -7,3 +7,4 @@ configure.ac:
 
 Makefile.am:
 TESTS += test-init.sh
+EXTRA_DIST += init.sh