Make it work with builddir != srcdir.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 62aa6618f1639bdd76748612eaddb7062a912d9b..dfd6cc4228d24988644631135cf4d9970566c874 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-25  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (EXTRA_DIST_html): Make it work when builddir != srcdir.
+
 2001-11-18  Bruno Haible  <bruno@clisp.org>
 
        * gettext.texi (Common Lisp): Update.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7c6b377e851e208446299adf8e9798587b6dbe99..f7560291dbe2fdce155ff8644e5b5b9f44e08cb1 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -66,7 +66,9 @@ html: html-split
 install-html: install-html-split
 uninstall-html: uninstall-html-split
 
-EXTRA_DIST_html = $(wildcard gettext_*.html)
+# This strange way of taking wildcards is a workaround to an automake-1.5 bug
+# which would occur if we wrote $(wildcard $(srcdir)/gettext_*.html).
+EXTRA_DIST_html = $(notdir $(wildcard gettext_*.html) $(wildcard $(addprefix $(srcdir), $(addprefix /, gettext_*.html))))
 CLEANFILES = gettext.pdf gettext.html
 # gettext.dvi and gettext.ps are already known to automake.
 MAINTAINERCLEANFILES = gettext_*.html

diff --git a/intl-java/ChangeLog b/intl-java/ChangeLog
index 5d9c64a40b8aa6775a103dda2f48baf3d9642ce4..a37b11187aa3446b80f47643d04cfca268ee3f1d 100644 (file)
--- a/intl-java/ChangeLog
+++ b/intl-java/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-25  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (install-javadoc1): Make it work when builddir != srcdir.
+       (install-javadoc2): Likewise.
+
 2001-11-03  Bruno Haible  <haible@clisp.cons.org>
 
        Distribute javadoc generated documentation.

diff --git a/intl-java/Makefile.am b/intl-java/Makefile.am
index 598134eb0d5eccd80e71e30737be152054ac6236..749640fa104f5e4314219f443f54e4b454e438ca 100644 (file)
--- a/intl-java/Makefile.am
+++ b/intl-java/Makefile.am
@@ -97,8 +97,8 @@ install-javadoc1: all-javadoc1
        $(mkinstalldirs) $(DESTDIR)$(htmldir)/javadoc1
        $(mkinstalldirs) $(DESTDIR)$(htmldir)/javadoc1/images
        @for f in $(JAVADOC1_FILES); do \
-         echo "$(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/$$f"; \
-         $(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/$$f; \
+         echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f"; \
+         $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f; \
        done
 
 installdirs-javadoc1:
@@ -139,8 +139,8 @@ install-javadoc2: all-javadoc2
        $(mkinstalldirs) $(DESTDIR)$(htmldir)/javadoc2
        $(mkinstalldirs) $(DESTDIR)$(htmldir)/javadoc2/gnu/gettext
        @for f in $(JAVADOC2_FILES); do \
-         echo "$(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/$$f"; \
-         $(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/$$f; \
+         echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f"; \
+         $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f; \
        done
 
 installdirs-javadoc2:

diff --git a/projects/ChangeLog b/projects/ChangeLog
index b108c08a5d43f47cfbff6bb67320b3533c4802c8..cb3ce0f4fadb3f15bc99978e946bc10a778c8fa6 100644 (file)
--- a/projects/ChangeLog
+++ b/projects/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-25  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (install-data-local): Make it work when
+       builddir != srcdir.
+
 2001-11-11  Bruno Haible  <haible@clisp.cons.org>
 
        * team-address: Remove verbose argument.

diff --git a/projects/Makefile.am b/projects/Makefile.am
index 947e39f9068a19a30f7ef806f63769f596391abb..b9df0322f14e644937760da1494ff8b469df8742 100644 (file)
--- a/projects/Makefile.am
+++ b/projects/Makefile.am
@@ -39,12 +39,12 @@ install-data-local:
          $(mkinstalldirs) $(DESTDIR)$(projectsdir)/$$p; \
        done
        @for f in $(SCRIPTFILES); do \
-         echo "$(INSTALL_SCRIPT) $$f $(DESTDIR)$(projectsdir)/$$f"; \
-         $(INSTALL_SCRIPT) $$f $(DESTDIR)$(projectsdir)/$$f; \
+         echo "$(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(projectsdir)/$$f"; \
+         $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(projectsdir)/$$f; \
        done
        @for f in $(DATAFILES); do \
-         echo "$(INSTALL_DATA) $$f $(DESTDIR)$(projectsdir)/$$f"; \
-         $(INSTALL_DATA) $$f $(DESTDIR)$(projectsdir)/$$f; \
+         echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(projectsdir)/$$f"; \
+         $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(projectsdir)/$$f; \
        done
 
 installdirs-local: