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

diff --git a/intl/ChangeLog b/intl/ChangeLog
index cc3f58703c790f3866cf364e779937a23b2ffc30..ae5608de498eda94130fafd9b5b8d34b4b33f344 100644 (file)
--- 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 4f1812c0322d25601241302f2fb11a6cf778c778..078be485f89ff868a14f8a9c96e41e4b190c6679 100644 (file)
--- 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 6a39446f90a1999e8bd956de7119bd004f4a7c1e..f424f96f3d097d1867de776cdd66be93e7bb1ed8 100644 (file)
--- 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 7eea75ca9020a158fb0db78d969cc9a1e7969573..32b7376550aeceffdff220b7d58d7928ab2498e8 100644 (file)
--- 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