Fix last patch, as it didn't work.

diff --git a/autoconf-lib-link/Makefile.am b/autoconf-lib-link/Makefile.am
index 39fcba7704884b7cb3a57c5ee6a6803b7f253871..3844f47cbad24c8eb23aaaa2106f8a656ad5341b 100644 (file)
--- a/autoconf-lib-link/Makefile.am
+++ b/autoconf-lib-link/Makefile.am
@@ -49,6 +49,7 @@ all-local: config/config.guess config/config.sub config/install-sh config/ltmain
 
 config-dir:
        test -d config || mkdir config
+       touch config-dir
 
 config/config.guess: $(srcdir)/../config/config.guess config-dir
        cp $(srcdir)/../config/config.guess config/config.guess
@@ -74,7 +75,7 @@ config/config.rpath: $(srcdir)/config.rpath config-dir
 DISTCLEANFILES += config/config.guess config/config.sub config/install-sh config/ltmain.sh config/mkinstalldirs config/missing config/config.rpath
 
 distclean-am:
-       rm -rf config
+       rm -rf config config-dir
 
 
 # Documentation tag not known to automake.

diff --git a/gettext-tools/doc/Makefile.am b/gettext-tools/doc/Makefile.am
index f74359806de4236570822ea1d7863365671b155c..9147b9093d227dae234e9e2ef07baae6255fc354 100644 (file)
--- a/gettext-tools/doc/Makefile.am
+++ b/gettext-tools/doc/Makefile.am
@@ -55,8 +55,20 @@ iso-3166.texi: ISO_3166 iso-3166.sed
        mv iso-3166.tmp $(srcdir)/iso-3166.texi
 
 # The dependencies of stamp-vti generated by automake are incomplete.
-stamp-vti: $(info_TEXINFOS) $(top_srcdir)/../version.sh
-
+# So we have to duplicate the entire rule which would otherwise be generated
+# by automake.
+stamp-vti: $(info_TEXINFOS) $(gettext_TEXINFOS) $(top_srcdir)/../version.sh
+       (dir=.; test -f ./gettext.texi || dir=$(srcdir); \
+       set `$(SHELL) $(top_srcdir)/../config/mdate-sh $$dir/gettext.texi`; \
+       echo "@set UPDATED $$1 $$2 $$3"; \
+       echo "@set UPDATED-MONTH $$2 $$3"; \
+       echo "@set EDITION $(VERSION)"; \
+       echo "@set VERSION $(VERSION)") > vti.tmp
+       cmp -s vti.tmp version.texi \
+         || (echo "Updating version.texi"; \
+             cp vti.tmp version.texi)
+       rm -f vti.tmp
+       cp version.texi $@
 
 # We distribute only the split HTML documentation.
 # The user can generate the others, via