# HG changeset patch # User John W. Eaton # Date 1356124293 18000 # Node ID f366e9948259f48c9743ee010c0c0b89c5a619db # Parent abc9e5f3c6613fbd1017fb131f463efa01e39cd8# Parent 23a180fd186d8e7f80c248119ac6daee66aa950c periodic merge of stable to default diff --git a/configure.ac b/configure.ac diff --git a/doc/interpreter/Makefile.am b/doc/interpreter/Makefile.am --- a/doc/interpreter/Makefile.am +++ b/doc/interpreter/Makefile.am @@ -289,7 +289,7 @@ clean-local: rm -rf t2d_cache -DISTCLEANFILES = $(BUILT_TEXINFOS) doc-cache +DISTCLEANFILES = $(BUILT_TEXINFOS) -MAINTAINERCLEANFILES = $(BUILT_IMAGES) +MAINTAINERCLEANFILES = $(BUILT_IMAGES) doc-cache diff --git a/doc/interpreter/mk_doc_cache.m b/doc/interpreter/mk_doc_cache.m diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 diff --git a/scripts/Makefile.am b/scripts/Makefile.am