Make the 'dist' target more reliable.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 68e796025e39bc82d9389020c285d5ec6cc96cb1..083479b76ac32e40dc30a6fd61176a82dae10db1 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-06  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.in (dist, distdir): Fail if some of the files to be
+       distributed do not exist or cannot be copied.
+       Suggested by Alexandre Duret-Lutz <adl@src.lip6.fr>.
+
 2005-02-24  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.14.2 released.

diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in
index 7010d88ee2f45322ecd9b0359b75a75471343156..612b59ca89d53c83d62c47d650fe94e7fb13442d 100644 (file)
--- a/gettext-runtime/intl/Makefile.in
+++ b/gettext-runtime/intl/Makefile.in
@@ -485,7 +485,7 @@ dist distdir: Makefile
          $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
          for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
            if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
-           cp -p $$dir/$$file $(distdir); \
+           cp -p $$dir/$$file $(distdir) || exit 1; \
          done; \
        fi
 

diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog
index 9398667dceaa01f302dd4100a9e2a845f681da58..18a98b53661a7089c30a70cc2ea24a1848283ec0 100644 (file)
--- a/gettext-runtime/po/ChangeLog
+++ b/gettext-runtime/po/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-06  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.in.in (dist2): Fail if some of the files to be distributed
+       do not exist or cannot be copied.
+       Suggested by Alexandre Duret-Lutz <adl@src.lip6.fr>.
+
 2005-03-06  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.in.in (DISTFILES): Remove $(DOMAIN).pot, stamp-po.

diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in
index 30b8d2021da701ade87b11096730784705605e71..7d099c2146e646ddf4f0a4827a4f293c981df7eb 100644 (file)
--- a/gettext-runtime/po/Makefile.in.in
+++ b/gettext-runtime/po/Makefile.in.in
@@ -323,9 +323,9 @@ dist2: stamp-po $(DISTFILES)
        if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
        for file in $$dists; do \
          if test -f $$file; then \
-           cp -p $$file $(distdir); \
+           cp -p $$file $(distdir) || exit 1; \
          else \
-           cp -p $(srcdir)/$$file $(distdir); \
+           cp -p $(srcdir)/$$file $(distdir) || exit 1; \
          fi; \
        done
 

diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index 09b1d70ff2423c17d210394c13d21fcb829b247c..eb0856cc63265390bfc3d93826e0a8bfc73ece71 100644 (file)
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-06  Bruno Haible  <bruno@clisp.org>
+
+       * gettext.texi (src/Makefile): Adjust example 'dist' target.
+       Suggested by Alexandre Duret-Lutz <adl@src.lip6.fr>.
+
 2005-02-24  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.14.2 released.

diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi
index be6e740d9ebfb4c1c7f69c8a4bd9e2a081bbcec3..31c78ad6cfed4aa6463ef20539ca2668ea39adc6 100644 (file)
--- a/gettext-tools/doc/gettext.texi
+++ b/gettext-tools/doc/gettext.texi
@@ -6895,7 +6895,7 @@ reasonable definition for it:
 distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
 dist: Makefile $(DISTFILES)
        for file in $(DISTFILES); do \
-         ln $$file $(distdir) 2>/dev/null || cp -p $$file $(distdir); \
+         ln $$file $(distdir) 2>/dev/null || cp -p $$file $(distdir) || exit 1; \
        done
 @end example
 

diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog
index a37b87e77caad181ea026502d6288a1127857531..15f9e4914bedf360186e5b093c141393d18d8b5d 100644 (file)
--- a/gettext-tools/po/ChangeLog
+++ b/gettext-tools/po/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-06  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.in.in (dist2): Fail if some of the files to be distributed
+       do not exist or cannot be copied.
+       Suggested by Alexandre Duret-Lutz <adl@src.lip6.fr>.
+
 2005-03-06  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.in.in (DISTFILES): Remove $(DOMAIN).pot, stamp-po.

diff --git a/gettext-tools/po/Makefile.in.in b/gettext-tools/po/Makefile.in.in
index 30b8d2021da701ade87b11096730784705605e71..7d099c2146e646ddf4f0a4827a4f293c981df7eb 100644 (file)
--- a/gettext-tools/po/Makefile.in.in
+++ b/gettext-tools/po/Makefile.in.in
@@ -323,9 +323,9 @@ dist2: stamp-po $(DISTFILES)
        if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
        for file in $$dists; do \
          if test -f $$file; then \
-           cp -p $$file $(distdir); \
+           cp -p $$file $(distdir) || exit 1; \
          else \
-           cp -p $(srcdir)/$$file $(distdir); \
+           cp -p $(srcdir)/$$file $(distdir) || exit 1; \
          fi; \
        done