From: Bruno Haible <bruno@clisp.org>
Date: Mon, 7 Mar 2005 19:56:52 +0000 (+0000)
Subject: Make the 'dist' target more reliable.
X-Git-Tag: v0.14.3~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4a9ff4319778c7e42f477d0e74db75ece0be566;p=thirdparty%2Fgettext.git

Make the 'dist' target more reliable.
---

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 68e796025..083479b76 100644
--- 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 7010d88ee..612b59ca8 100644
--- 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 9398667dc..18a98b536 100644
--- 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 30b8d2021..7d099c214 100644
--- 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 09b1d70ff..eb0856cc6 100644
--- 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 be6e740d9..31c78ad6c 100644
--- 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 a37b87e77..15f9e4914 100644
--- 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 30b8d2021..7d099c214 100644
--- 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