diff options
| author | Bruno Haible <bruno@clisp.org> | 2001-11-26 13:46:15 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-21 23:25:43 +0200 |
| commit | 3018def7a8a53ff208cc9764a1604d744cd481cd (patch) | |
| tree | 52c59e136db94aa7cddea54cadddc820e693f5d9 | |
| parent | ad3b0e3a4d47b47daff9d7fc67218888fbac5159 (diff) | |
| download | external_gettext-3018def7a8a53ff208cc9764a1604d744cd481cd.zip external_gettext-3018def7a8a53ff208cc9764a1604d744cd481cd.tar.gz external_gettext-3018def7a8a53ff208cc9764a1604d744cd481cd.tar.bz2 | |
Make it work with builddir != srcdir.
| -rw-r--r-- | doc/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/Makefile.am | 4 | ||||
| -rw-r--r-- | intl-java/ChangeLog | 5 | ||||
| -rw-r--r-- | intl-java/Makefile.am | 8 | ||||
| -rw-r--r-- | projects/ChangeLog | 5 | ||||
| -rw-r--r-- | projects/Makefile.am | 8 |
6 files changed, 25 insertions, 9 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog index 62aa661..dfd6cc4 100644 --- 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 7c6b377..f756029 100644 --- 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 5d9c64a..a37b111 100644 --- 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 598134e..749640f 100644 --- 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 b108c08..cb3ce0f 100644 --- 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 947e39f..b9df032 100644 --- 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: |