Switch to automake-1.10.

diff --git a/autogen.sh b/autogen.sh
index ea40fcc339a4685b2e5f8f204a912e6ae7f9b88d..c94a2f928cab32b72bf9afb3a8adc2b2539078fe 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,7 +2,7 @@
 # Convenience script for regenerating all aclocal.m4, config.h.in, Makefile.in,
 # configure files with new versions of autoconf or automake.
 #
-# This script requires autoconf-2.60 and automake-1.8.2..1.9 in the PATH.
+# This script requires autoconf-2.60 and automake-1.10 in the PATH.
 # It also requires either
 #   - the GNULIB_TOOL environment variable pointing to the gnulib-tool script
 #     in a gnulib checkout, or

diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index a9d5b98a8d62f800543c674bb4297ea6506773cc..38b7f947f242676950fa86222863f6c4044357f8 100644 (file)
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-16  Bruno Haible  <bruno@clisp.org>
+
+       Switch to automake-1.10.
+       * Makefile.am (install-dvi, install-ps, install-pdf): Remove rules.
+       (HTMLS): New variable.
+       (html-local): Use it.
+       (install-html): Remove rule.
+
 2006-10-11  Paul Eggert  <eggert@cs.ucla.edu>
             Bruno Haible  <bruno@clisp.org>
 

diff --git a/gettext-runtime/libasprintf/Makefile.am b/gettext-runtime/libasprintf/Makefile.am
index a1e7bb93908e31c8079444e8ae78e9fd32ba7c88..44b6431c2fba8a41fd85f34a31ba3fe508bb728f 100644 (file)
--- a/gettext-runtime/libasprintf/Makefile.am
+++ b/gettext-runtime/libasprintf/Makefile.am
@@ -108,9 +108,7 @@ CLEANFILES = autosprintf.pdf
 
 # Documentation in DVI format.
 
-install-dvi: autosprintf.dvi
-       $(mkdir_p) $(DESTDIR)$(dvidir)
-       $(INSTALL_DATA) `if test -f autosprintf.dvi; then echo .; else echo $(srcdir); fi`/autosprintf.dvi $(DESTDIR)$(dvidir)/autosprintf.dvi
+# The install-dvi target is already defined by automake.
 
 installdirs-dvi:
        $(mkdir_p) $(DESTDIR)$(dvidir)
@@ -131,9 +129,7 @@ DVIPS = @DVIPS@ -D600
 autosprintf.ps: autosprintf.dvi
        $(DVIPS) -o $@ `if test -f autosprintf.dvi; then echo autosprintf.dvi; else echo $(srcdir)/autosprintf.dvi; fi`
 
-install-ps: autosprintf.ps
-       $(mkdir_p) $(DESTDIR)$(psdir)
-       $(INSTALL_DATA) `if test -f autosprintf.ps; then echo .; else echo $(srcdir); fi`/autosprintf.ps $(DESTDIR)$(psdir)/autosprintf.ps
+# The install-ps target is already defined by automake.
 
 installdirs-ps:
        $(mkdir_p) $(DESTDIR)$(psdir)
@@ -146,9 +142,7 @@ uninstall-ps:
 
 SUFFIXES = .pdf
 
-install-pdf: autosprintf.pdf
-       $(mkdir_p) $(DESTDIR)$(pdfdir)
-       $(INSTALL_DATA) `if test -f autosprintf.pdf; then echo .; else echo $(srcdir); fi`/autosprintf.pdf $(DESTDIR)$(pdfdir)/autosprintf.pdf
+# The install-pdf target is already defined by automake.
 
 installdirs-pdf:
        $(mkdir_p) $(DESTDIR)$(pdfdir)
@@ -161,7 +155,9 @@ uninstall-pdf:
 
 TEXI2HTML = @PERL@ $(srcdir)/texi2html
 
-html-local: autosprintf_all.html
+HTMLS = autosprintf_all.html
+
+html-local: $(HTMLS)
 
 # Override of automake's definition.
 # We want to use texi2html, not makeinfo --html.
@@ -169,9 +165,7 @@ autosprintf_all.html: autosprintf.texi
        $(TEXI2HTML) -expandinfo -number -monolithic `if test -f autosprintf.texi; then echo autosprintf.texi; else echo $(srcdir)/autosprintf.texi; fi`
        mv autosprintf.html autosprintf_all.html
 
-install-html: autosprintf_all.html
-       $(mkdir_p) $(DESTDIR)$(htmldir)
-       $(INSTALL_DATA) `if test -f autosprintf_all.html; then echo .; else echo $(srcdir); fi`/autosprintf_all.html $(DESTDIR)$(htmldir)/autosprintf.html
+# The install-html target is already defined by automake.
 
 installdirs-html:
        $(mkdir_p) $(DESTDIR)$(htmldir)

diff --git a/gettext-runtime/man/ChangeLog b/gettext-runtime/man/ChangeLog
index f75e990ebb554d3ce4636fe663d37eba0cb8b398..a4f828d0f3712530a59b96b806058f6f74f10213 100644 (file)
--- a/gettext-runtime/man/ChangeLog
+++ b/gettext-runtime/man/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-16  Bruno Haible  <bruno@clisp.org>
+
+       Switch to automake-1.10.
+       * Makefile.am (install-html-local): Renamed from install-html.
+
 2006-07-25  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.msvc: Remove file.

diff --git a/gettext-runtime/man/Makefile.am b/gettext-runtime/man/Makefile.am
index addaab8b91dae31430669e2faf12b97a17040ad8..8adb30bc83b3e0fcdafa552dcf28bbce8c009ce6 100644 (file)
--- a/gettext-runtime/man/Makefile.am
+++ b/gettext-runtime/man/Makefile.am
@@ -159,7 +159,7 @@ bind_textdomain_codeset.3.html: bind_textdomain_codeset.3.in
        $(MAN2HTML) $(srcdir)/bind_textdomain_codeset.3.in | sed -e '/CreationDate:/d' > t-$@
        mv t-$@ $@
 
-install-html:
+install-html-local:
        $(mkdir_p) $(DESTDIR)$(htmldir)
        for file in $(man_HTML); do \
          if test -f $$file; then dir=.; else dir=$(srcdir); fi; \

diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index 00285c20ddea71b32ca611acfdee2427d7dc2636..a4679d5f7eef9f7ff8c8403025e5250804f22775 100644 (file)
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-16  Bruno Haible  <bruno@clisp.org>
+
+       Switch to automake-1.10.
+       * Makefile.am (install-html): Add no-op rule.
+       (install-dvi, install-ps, install-pdf): Remove rules.
+
 2006-10-17  Bruno Haible  <bruno@clisp.org>
 
        * ISO_639-2: New file.

diff --git a/gettext-tools/doc/Makefile.am b/gettext-tools/doc/Makefile.am
index a60c8fa0dfc7c9b4f1a2f0d662023cae63739147..6800a06049ffab1678b6d0a1bf17bdf5992840c6 100644 (file)
--- a/gettext-tools/doc/Makefile.am
+++ b/gettext-tools/doc/Makefile.am
@@ -96,7 +96,11 @@ uninstall-local: uninstall-html
 #distdir: dist-html
 
 html-local: html-split
+# Override of automake's definition. The HTML files we want to distribute are
+# not the ones that automake knows about, and we cannot define HTMLS to a value
+# containing wildcards.
 install-html: install-html-split
+       @:
 uninstall-html: uninstall-html-split
 dist-html: dist-html-split
 
@@ -111,9 +115,7 @@ MAINTAINERCLEANFILES = gettext_*.html
 #TEXI2DVI = texi2dvi
 TEXI2DVI = texi2dvi $(TEXINCLUDES)
 
-install-dvi: gettext.dvi
-       $(mkdir_p) $(DESTDIR)$(dvidir)
-       $(INSTALL_DATA) `if test -f gettext.dvi; then echo .; else echo $(srcdir); fi`/gettext.dvi $(DESTDIR)$(dvidir)/gettext.dvi
+# The install-dvi target is already defined by automake.
 
 installdirs-dvi:
        $(mkdir_p) $(DESTDIR)$(dvidir)
@@ -144,9 +146,7 @@ DVIPS = @DVIPS@ -D600
 gettext.ps: gettext.dvi
        $(DVIPS) -o $@ `if test -f gettext.dvi; then echo gettext.dvi; else echo $(srcdir)/gettext.dvi; fi`
 
-install-ps: gettext.ps
-       $(mkdir_p) $(DESTDIR)$(psdir)
-       $(INSTALL_DATA) `if test -f gettext.ps; then echo .; else echo $(srcdir); fi`/gettext.ps $(DESTDIR)$(psdir)/gettext.ps
+# The install-ps target is already defined by automake.
 
 installdirs-ps:
        $(mkdir_p) $(DESTDIR)$(psdir)
@@ -162,9 +162,7 @@ uninstall-ps:
 TEXI2PDF = @TEXI2PDF@ $(TEXINCLUDES)
 SUFFIXES = .pdf
 
-install-pdf: gettext.pdf
-       $(mkdir_p) $(DESTDIR)$(pdfdir)
-       $(INSTALL_DATA) `if test -f gettext.pdf; then echo .; else echo $(srcdir); fi`/gettext.pdf $(DESTDIR)$(pdfdir)/gettext.pdf
+# The install-pdf target is already defined by automake.
 
 installdirs-pdf:
        $(mkdir_p) $(DESTDIR)$(pdfdir)

diff --git a/gettext-tools/man/ChangeLog b/gettext-tools/man/ChangeLog
index bed05368ef7c5511a64cc50bd28bfa28a553f862..6fd0e6d28ae578a0686c5abee10597d77277a3d8 100644 (file)
--- a/gettext-tools/man/ChangeLog
+++ b/gettext-tools/man/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-16  Bruno Haible  <bruno@clisp.org>
+
+       Switch to automake-1.10.
+       * Makefile.am (install-html-local): Renamed from install-html.
+
 2006-07-25  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.msvc: Remove file.

diff --git a/gettext-tools/man/Makefile.am b/gettext-tools/man/Makefile.am
index c5277293026c4c088b5e531fb3bbfdfd9b4cdb9d..6ac530b56c7d5f6c94bc3cc481d9c10059d27106 100644 (file)
--- a/gettext-tools/man/Makefile.am
+++ b/gettext-tools/man/Makefile.am
@@ -179,7 +179,7 @@ autopoint.1.html: autopoint.1
        $(MAN2HTML) `if test -f autopoint.1; then echo .; else echo $(srcdir); fi`/autopoint.1 | sed -e '/CreationDate:/d' > t-$@
        mv t-$@ $@
 
-install-html:
+install-html-local:
        $(mkdir_p) $(DESTDIR)$(htmldir)
        for file in $(man_HTML); do \
          if test -f $$file; then dir=.; else dir=$(srcdir); fi; \