From bba395097b51e4bf8c66a5ca344080f6188b227f Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 18 Oct 2011 18:39:35 +0300 Subject: [PATCH] Avoid dependency on doc-install.pl. Bug #648860. * configure.ac: Distribute doc-install.pl with the tarball to avoid depending on mm-common for tarball builds. --- ChangeLog | 7 +++++++ configure.ac | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4c3fa3a..10c1405 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-10-18 Kalev Lember + +vi-Avoid dependency on doc-install.pl. Bug #648860. + +vi-* configure.ac: Distribute doc-install.pl with the tarball to +vi-avoid depending on mm-common for tarball builds. + 2.28.2: 2010-06-04 Murray Cumming diff --git a/configure.ac b/configure.ac index fbcaf6f..7391c46 100644 --- a/configure.ac +++ b/configure.ac @@ -30,9 +30,14 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) AM_MAINTAINER_MODE AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I ]) -MM_PREREQ([0.7.1]) +MM_PREREQ([0.9.5]) MM_INIT_MODULE([gconfmm-2.6]) +# Copy the mm-common .pl scripts into docs/, +# and use them from there, +# so we can dist them to avoid a tarball-build dependency. +MM_CONFIG_DOCTOOL_DIR([docs]) + # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html AC_SUBST([LIBGCONFMM_SO_VERSION], [1:6:0]) -- 1.7.6.4