From 8f6fcc4f0b5f35452c02b52c0a0d112c768fa016 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 6 Jun 2009 10:47:18 +0000 Subject: [PATCH] Use dist-hook instead of old distdir hack. --- gettext-tools/ChangeLog | 5 +++++ gettext-tools/configure.ac | 3 +-- gettext-tools/doc/Makefile.am | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog index 75c202ed5..f5a573be3 100644 --- a/gettext-tools/ChangeLog +++ b/gettext-tools/ChangeLog @@ -1,3 +1,8 @@ +2009-05-31 Bruno Haible + + * doc/Makefile.am: Use dist-hook instead of old distdir hack. + * configure.ac (doc/Makefile.am): Don't invoke FIX_MAKEFILE_DISTRIB. + 2009-05-29 Bruno Haible Avoid lang-c++ test failure. diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac index f454305b6..1451ec3a7 100644 --- a/gettext-tools/configure.ac +++ b/gettext-tools/configure.ac @@ -357,8 +357,7 @@ AC_CONFIG_SUBDIRS([examples]) AC_CONFIG_FILES([Makefile]) -AC_CONFIG_FILES([doc/Makefile], - [FIX_MAKEFILE_DISTRIB]) +AC_CONFIG_FILES([doc/Makefile]) AC_CONFIG_FILES([intl/Makefile:../gettext-runtime/intl/Makefile.in], [ # Change srcdir variable so that it points to ../gettext-runtime/intl. diff --git a/gettext-tools/doc/Makefile.am b/gettext-tools/doc/Makefile.am index 5198fb50d..c58c4c995 100644 --- a/gettext-tools/doc/Makefile.am +++ b/gettext-tools/doc/Makefile.am @@ -94,8 +94,7 @@ all-local: html-local 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 +dist-hook: dist-html html-local: html-split # Override of automake's definition. The HTML files we want to distribute are -- 2.47.2