From: Bruno Haible <bruno@clisp.org>
Date: Fri, 18 May 2001 15:11:33 +0000 (+0000)
Subject: Let "make dist" work with builddir !- srcdir.
X-Git-Tag: v0.10.38~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5762cd8ef6846fd2038beb555b190cf06268451;p=thirdparty%2Fgettext.git

Let "make dist" work with builddir !- srcdir.
---

diff --git a/intl/ChangeLog b/intl/ChangeLog
index cc3f58703..ae5608de4 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-18  Bruno Haible  <haible@clisp.cons.org>
+
+	* Makefile.in (dist): Don't assume $(srcdir) = ".". Distribute
+	file in either current directory or $(srcdir), whichever exists.
+
 2001-05-11  Bruno Haible  <haible@clisp.cons.org>
 
 	* Makefile.in (install-exec): Don't install charset.alias on glibc 2.1
diff --git a/intl/Makefile.in b/intl/Makefile.in
index 4f1812c03..078be485f 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -292,8 +292,9 @@ dist distdir: Makefile
 	fi; \
 	$(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
 	for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
-	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
-	    || cp -p $(srcdir)/$$file $(distdir); \
+	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+	  ln $$dir/$$file $(distdir) 2> /dev/null \
+	    || cp -p $$dir/$$file $(distdir); \
 	done
 
 Makefile: Makefile.in ../config.status
diff --git a/po/ChangeLog b/po/ChangeLog
index 6a39446f9..f424f96f3 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-18  Bruno Haible  <haible@clisp.cons.org>
+
+	* Makefile.in.in (dist2): Don't assume $(srcdir) = ".". Distribute
+	file in either current directory or $(srcdir), whichever exists.
+
 2001-05-17  Bruno Haible  <haible@clisp.cons.org>
 
 	* cs.po: New file, from Vladimir Michl <Vladimir.Michl@seznam.cz>.
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 7eea75ca9..32b737655 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -161,7 +161,8 @@ dist distdir:
 dist2: $(DISTFILES)
 	dists="$(DISTFILES)"; \
 	for file in $$dists; do \
-	  cp -p $(srcdir)/$$file $(distdir); \
+	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+	  cp -p $$dir/$$file $(distdir); \
 	done
 
 update-po: Makefile