Don't use GNU make extensions in doc/Makefile.

diff --git a/ChangeLog b/ChangeLog
index afcc17a43315c57dd5d3eecabe73c1ff5f7a9ced..3baa37a9f0aa6b8d9dff3b340088b3fd301a406f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-05  Bruno Haible  <bruno@clisp.org>
+
+       * configure.in: Postprocess doc/Makefile.
+
 2002-01-04  Bruno Haible  <haible@clisp.cons.org>
 
        * configure.in: Change version number to 0.11-pre5.

diff --git a/configure.in b/configure.in
index ef31088e06f13bd66170d93e916d769baf9f57e4..e720f642210c92cb26371734716a69809210bb9d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -159,12 +159,15 @@ AC_OUTPUT([Makefile \
            projects/Makefile \
            misc/Makefile misc/gettextize], [
   dnl Fix unesthetic build commands generated by automake.
-changequote(,)dnl
   for m in lib/Makefile src/Makefile tests/Makefile; do
     sed -e "s,\`test -f \\\$< || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," < $m > $m.tmp
     mv $m.tmp $m
   done
-changequote([, ])dnl
+  dnl Fix an automake-1.5 bug.
+  for m in doc/Makefile; do
+    sed -e 's,^#distdir:,distdir:,' < $m > $m.tmp
+    mv $m.tmp $m
+  done
   dnl Fix permissions of misc/gettextize.
   chmod a+x misc/gettextize
 ])

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 49ed2a3423b06632d537c6558e04a650be9bdc0b..c1388c4e9a736bcaac147ff65c838ef5f2c8c02e 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-05  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (EXTRA_DIST_html): Remove variable.
+       (EXTRA_DIST): Remove $(EXTRA_DIST_html).
+       (dist-html, dist-html-monolithic, dist-html-split): New rules.
+       (distdir): Depend on dist-html.
+
 2002-01-04  Bruno Haible  <bruno@clisp.org>
 
        * gettext.texi (Comparison): Remove paragraph about alloca. libintl

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 78bd6087cfee251dd3280e8fcaefc629c302c3da..541b62873876c5dfabb8b61a1210da849ed1174c 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the doc subdirectory of the GNU NLS Utilities
-## Copyright (C) 1995-1997, 2001 Free Software Foundation, Inc.
+## Copyright (C) 1995-1997, 2001-2002 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -38,7 +38,7 @@ gettext_TEXINFOS = \
   msgattrib.texi msgen.texi msgexec.texi msgfmt.texi msgunfmt.texi \
   iso-639.texi iso-3166.texi
 
-EXTRA_DIST = iso-639.sed iso-3166.sed ISO_639 ISO_3166 nls.texi matrix.texi $(EXTRA_DIST_html) texi2html
+EXTRA_DIST = iso-639.sed iso-3166.sed ISO_639 ISO_3166 nls.texi matrix.texi texi2html
 
 iso-639.texi: ISO_639 iso-639.sed
        $(SED) -f $(srcdir)/iso-639.sed $(srcdir)/ISO_639 > iso-639.tmp
@@ -61,14 +61,14 @@ all-local: html
 install-data-local: install-html
 installdirs-local: installdirs-html
 uninstall-local: uninstall-html
+# Hidden from automake, but really activated. Works around an automake-1.5 bug.
+#distdir: dist-html
 
 html: html-split
 install-html: install-html-split
 uninstall-html: uninstall-html-split
+dist-html: dist-html-split
 
-# 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
@@ -166,6 +166,21 @@ uninstall-html-monolithic:
 uninstall-html-split:
        $(RM) $(DESTDIR)$(htmldir)/gettext_*.html
 
+dist-html-monolithic:
+       $(mkinstalldirs) $(distdir)/
+       file=gettext.html; \
+       if test -f $$file; then d=.; else d=$(srcdir); fi; \
+       cp -p $$d/$$file $(distdir)/$$file || exit 1
+
+# We would like to put gettext_*.html into EXTRA_DIST, but it doesn't work.
+dist-html-split:
+       $(mkinstalldirs) $(distdir)/
+       file=gettext_toc.html; \
+       if test -f $$file; then d=.; else d=$(srcdir); fi; \
+       for file in `cd $$d && echo gettext_*.html`; do \
+         cp -p $$d/$$file $(distdir)/$$file || exit 1; \
+       done
+
 
 # One more automake bug.
 installdirs: installdirs-local