examples: Include hello-*.pot in the distribution

Partially revert 2c3d71ce, as it broke "make dist".  Instead,
include all the generated POT files in the distribution to prevent
re-generation of those files.
* Makefile.am (distdir1): Call update-po in po/Makefile.
* po/Makefile.am ($(DOMAIN).pot-update): Specify --directory for
xgettext invocation.
(DISTCLEANFILES): Move $(SMALLPOTS)...
(MAINTAINERCLEANFILES): ...here.
(distdir1): Include $(SMALLPOTS) in the distribution.

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index da08c96d5b79024572a90094400e1d9bde619337..ab2b7e3b1cfdcb3d00d9f5c0a1680924de52a45e 100644 (file)
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,16 @@
+2014-12-05  Daiki Ueno  <ueno@gnu.org>
+
+       examples: Include hello-*.pot in the distribution
+       Partially revert 2c3d71ce, as it broke "make dist".  Instead,
+       include all the generated POT files in the distribution to prevent
+       re-generation of those files.
+       * Makefile.am (distdir1): Call update-po in po/Makefile.
+       * po/Makefile.am ($(DOMAIN).pot-update): Specify --directory for
+       xgettext invocation.
+       (DISTCLEANFILES): Move $(SMALLPOTS)...
+       (MAINTAINERCLEANFILES): ...here.
+       (distdir1): Include $(SMALLPOTS) in the distribution.
+
 2014-12-04  Daiki Ueno  <ueno@gnu.org>
 
        examples: Don't forcibly regenerate POT files on 'make dist'

diff --git a/gettext-tools/examples/Makefile.am b/gettext-tools/examples/Makefile.am
index 9cc56ff8681698dc95254ed8662de0b2fa5ae9d1..9092649b70c5bed994dfab2097c8b72356a74e93 100644 (file)
--- a/gettext-tools/examples/Makefile.am
+++ b/gettext-tools/examples/Makefile.am
@@ -504,6 +504,7 @@ uninstall-local:
 
 # Invoked from inside automake's distdir target.
 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,/[^/]*$$,,'`; \

diff --git a/gettext-tools/examples/po/Makefile.am b/gettext-tools/examples/po/Makefile.am
index 0f5d2861153126865017e1a4f64c6a4e421f9b39..cd9b365eab68acb5991e927640efc58335eaa8f4 100644 (file)
--- a/gettext-tools/examples/po/Makefile.am
+++ b/gettext-tools/examples/po/Makefile.am
@@ -198,6 +198,7 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) $(SMALLPOTS) remove-potcdate.sed
          --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
          --copyright-holder='$(COPYRIGHT_HOLDER)' \
          --msgid-bugs-address="$$msgid_bugs_address" \
+         --directory='$(srcdir)' \
          $(SMALLPOTS)
        test ! -f $(DOMAIN).po || { \
          if test -f $(srcdir)/$(DOMAIN).pot; then \
@@ -329,9 +330,7 @@ MOSTLYCLEANFILES += stamp-poT
 MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
 MOSTLYCLEANFILES += *.o
 
-DISTCLEANFILES = $(SMALLPOTS)
-
-MAINTAINERCLEANFILES = stamp-po
+MAINTAINERCLEANFILES = stamp-po $(SMALLPOTS)
 
 EXTRA_DIST = remove-potcdate.sin xsmallpot.sh mmsmallpo.sh LINGUAS \
   $(POFILES)
@@ -340,7 +339,7 @@ EXTRA_DIST = remove-potcdate.sin xsmallpot.sh mmsmallpo.sh LINGUAS \
 #distdir: distdir1
 distdir1:
        if test -f $(srcdir)/$(DOMAIN).pot; then \
-         for file in $(DOMAIN).pot stamp-po; do \
+         for file in $(DOMAIN).pot stamp-po $(SMALLPOTS); do \
            if test -f $$file; then d=.; else d=$(srcdir); fi; \
            cp -p $$d/$$file $(distdir)/$$file || exit 1; \
          done; \