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