[pangomm] Avoid a tarball dependency on mm-common.



commit 469ec69e7f2f0966955e758299d180ad41da3fe2
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Mar 25 09:22:02 2011 +0100

    Avoid a tarball dependency on mm-common.
    
    * configure.ac: Add a call to MM_CONFIG_DOCTOOL_DIR() telling it to
    copy the files locally and use them from there.
    * docs/Makefile.am: Dist the copied files, so that the build does not
    try to use the versions installed by mm-common.

 ChangeLog        |    9 +++++++++
 configure.ac     |    5 +++++
 docs/Makefile.am |    7 +++++++
 3 files changed, 21 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ea131fa..c85d919 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-03-25  Murray Cumming  <murrayc murrayc com>
+
+	Avoid a tarball dependency on mm-common.
+
+	* configure.ac: Add a call to MM_CONFIG_DOCTOOL_DIR() telling it to
+	copy the files locally and use them from there.
+	* docs/Makefile.am: Dist the copied files, so that the build does not
+	try to use the versions installed by mm-common.
+
 2.28.0 (stable):
 
 Just a version increase and a regenerated tarball due to changes in an m4
diff --git a/configure.ac b/configure.ac
index b4fc5dd..fe2151f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,11 @@ AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
 MM_PREREQ([0.7.1])
 MM_INIT_MODULE([pangomm-1.4])
 
+# 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([LIBPANGOMM_SO_VERSION], [1:30:0])
 
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 35cc297..d2c5454 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -28,3 +28,10 @@ docimagesdir = $(libdocdir)/images
 dist_docimages_DATA = images/gtkmm_logo.gif images/top.gif
 
 include $(top_srcdir)/build/doc-reference.am
+
+# These are copied here by mm-common:
+dist_noinst_DATA += \
+	doc-install.pl \
+	doc-postprocess.pl \
+	tagfile-to-devhelp2.xsl \
+	doxygen.css



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]