From d12add3f1d23dc7956c7f1e76c6d9d82c3853dcb Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 18 May 2001 15:08:11 +0000 Subject: Let "make dist" work with builddir !- srcdir. --- intl/ChangeLog | 5 +++++ intl/Makefile.in | 5 +++-- po/ChangeLog | 5 +++++ po/Makefile.in.in | 3 ++- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/intl/ChangeLog b/intl/ChangeLog index 2599a58..88b93ec 100644 --- a/intl/ChangeLog +++ b/intl/ChangeLog @@ -1,3 +1,8 @@ +2001-05-18 Bruno Haible + + * Makefile.in (dist): Don't assume $(srcdir) = ".". Distribute + file in either current directory or $(srcdir), whichever exists. + 2001-05-11 Bruno Haible * Makefile.in (install-exec): Don't install charset.alias on glibc 2.1 diff --git a/intl/Makefile.in b/intl/Makefile.in index 4f1812c..078be48 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 30e850a..cc52716 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,8 @@ +2001-05-18 Bruno Haible + + * Makefile.in.in (dist2): Don't assume $(srcdir) = ".". Distribute + file in either current directory or $(srcdir), whichever exists. + 2001-05-17 Bruno Haible * cs.po: New file, from Vladimir Michl . diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 7eea75c..32b7376 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 -- cgit v1.1