From: Bruno Haible <bruno@clisp.org>
Date: Tue, 2 Dec 2003 20:40:41 +0000 (+0000)
Subject: Fix the distribution rules for the examples/po files.
X-Git-Tag: v0.13.1~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=140e1230f7b2bc7fb3c265efc7e85d9610dbeda6;p=thirdparty%2Fgettext.git

Fix the distribution rules for the examples/po files.
---

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index 66c37012d..064091535 100644
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,7 @@
+2003-12-02  Bruno Haible  <bruno@clisp.org>
+
+	* configure.ac: Invoke FIX_MAKEFILE_DISTRIB for examples/Makefile.
+
 2003-11-30  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.13 released.
diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 6587b8da5..565e61c8c 100644
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -275,7 +275,8 @@ AC_CONFIG_FILES([m4/Makefile])
 AC_CONFIG_FILES([tests/Makefile],
                 [FIX_MAKEFILE_COMPILE])
 
-AC_CONFIG_FILES([examples/Makefile])
+AC_CONFIG_FILES([examples/Makefile],
+                [FIX_MAKEFILE_DISTRIB])
 AC_CONFIG_FILES([examples/installpaths])
 AC_CONFIG_FILES([examples/po/Makefile], [AM_POSTPROCESS_PO_MAKEFILE])
 
diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index f774d4f2e..7f26b653f 100644
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,11 +1,16 @@
+2003-12-02  Bruno Haible  <bruno@clisp.org>
+
+	* examples/Makefile.am (EXTRA_DIST): Don't add the EXAMPLESFILES.
+	(distdir1): New rule. Install the EXAMPLESFILES after 'update-po'.
+
 2003-11-30  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.13 released.
 
 2003-11-30  Bruno Haible  <bruno@clisp.org>
 
-	* mmsmallpo.sh: Remove the POT-Creation-Date line from the generated PO
-	file.
+	* po/mmsmallpo.sh: Remove the POT-Creation-Date line from the generated
+	PO file.
 	* Makefile.am (EXAMPLESFILES): Add hello-pascal/hello.rst.
 
 2003-11-30  Bruno Haible  <bruno@clisp.org>
diff --git a/gettext-tools/examples/Makefile.am b/gettext-tools/examples/Makefile.am
index 96037d0dc..720df50a2 100644
--- a/gettext-tools/examples/Makefile.am
+++ b/gettext-tools/examples/Makefile.am
@@ -543,7 +543,18 @@ uninstall-local:
 	  rm -f $(DESTDIR)$(examplesdir)/$$f; \
 	done
 
-EXTRA_DIST += $(EXAMPLESFILES)
+# Hidden from automake, but really activated. Works around an automake-1.5 bug.
+#distdir: distdir1
+distdir1:
+	cd po && $(MAKE) update-po
+	for file in $(EXAMPLESFILES); do \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
+	  cp -p $$d/$$file $(distdir)/$$file || exit 1; \
+	done
 
 # Temporary directories created by po/Makefile.
 CLEANFILES = tmp-hello-*