From: Bruno Haible Date: Fri, 20 Oct 2006 11:53:17 +0000 (+0000) Subject: Switch to automake-1.10. X-Git-Tag: 0.16.x-branchpoint~51 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5f987b22e950b93749561d00e986c3e67d3b717;p=thirdparty%2Fgettext.git Switch to automake-1.10. --- diff --git a/autogen.sh b/autogen.sh index ea40fcc33..c94a2f928 100755 --- 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 a9d5b98a8..38b7f947f 100644 --- a/gettext-runtime/libasprintf/ChangeLog +++ b/gettext-runtime/libasprintf/ChangeLog @@ -1,3 +1,11 @@ +2006-10-16 Bruno Haible + + 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 Bruno Haible diff --git a/gettext-runtime/libasprintf/Makefile.am b/gettext-runtime/libasprintf/Makefile.am index a1e7bb939..44b6431c2 100644 --- 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 f75e990eb..a4f828d0f 100644 --- a/gettext-runtime/man/ChangeLog +++ b/gettext-runtime/man/ChangeLog @@ -1,3 +1,8 @@ +2006-10-16 Bruno Haible + + Switch to automake-1.10. + * Makefile.am (install-html-local): Renamed from install-html. + 2006-07-25 Bruno Haible * Makefile.msvc: Remove file. diff --git a/gettext-runtime/man/Makefile.am b/gettext-runtime/man/Makefile.am index addaab8b9..8adb30bc8 100644 --- 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 00285c20d..a4679d5f7 100644 --- a/gettext-tools/doc/ChangeLog +++ b/gettext-tools/doc/ChangeLog @@ -1,3 +1,9 @@ +2006-10-16 Bruno Haible + + 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 * ISO_639-2: New file. diff --git a/gettext-tools/doc/Makefile.am b/gettext-tools/doc/Makefile.am index a60c8fa0d..6800a0604 100644 --- 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 bed05368e..6fd0e6d28 100644 --- a/gettext-tools/man/ChangeLog +++ b/gettext-tools/man/ChangeLog @@ -1,3 +1,8 @@ +2006-10-16 Bruno Haible + + Switch to automake-1.10. + * Makefile.am (install-html-local): Renamed from install-html. + 2006-07-25 Bruno Haible * Makefile.msvc: Remove file. diff --git a/gettext-tools/man/Makefile.am b/gettext-tools/man/Makefile.am index c52772930..6ac530b56 100644 --- 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; \