[glibmm] Use versioned directory for documentation tools

[Daniel Elstner <daniel src gnome org>]

commit c5a252d925de1fabe6e0660776deb7ad9da8a1b7
Author: Daniel Elstner <danielk openismus com>
Date:   Mon Aug 10 09:13:30 2009 +0200

    Use versioned directory for documentation tools
    
    * docs/Makefile.am (doctooldir): Use the versioned module
    name instead of the package name as $(datadir) subdirectory.
    * glib/glibmm-2.4.pc.in (doctooldir): Change the variable
    value accordingly.

 ChangeLog             |    9 +++++++++
 docs/Makefile.am      |    2 +-
 glib/glibmm-2.4.pc.in |    2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6d32f62..531ce60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2009-08-09  Daniel Elstner  <danielk openismus com>
 
+	Use versioned directory for documentation tools
+
+	* docs/Makefile.am (doctooldir): Use the versioned module
+	name instead of the package name as $(datadir) subdirectory.
+	* glib/glibmm-2.4.pc.in (doctooldir): Change the variable
+	value accordingly.
+
+2009-08-09  Daniel Elstner  <danielk openismus com>
+
 	Provide documentation location via pkg-config
 
 	* glib/glibmm-2.4.pc.in: Clean up and modernize the values,
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 9fd0702..149c944 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -36,7 +36,7 @@ doc_install         = $(PERL) -- $(srcdir)/doc-install.pl
 doc_postprocess     = $(PERL) -- $(srcdir)/doc-postprocess.pl
 tagfile_to_devhelp2 = $(srcdir)/tagfile-to-devhelp2.xsl
 
-doctooldir = $(pkgdatadir)/doctool
+doctooldir = $(datadir)/$(GLIBMM_MODULE_NAME)/doctool
 dist_doctool_DATA = doc-postprocess.pl doc-install.pl tagfile-to-devhelp2.xsl
 
 docimagesdir = $(libdocdir)/images
diff --git a/glib/glibmm-2.4.pc.in b/glib/glibmm-2.4.pc.in
index a1d2379..ba4ee3d 100644
--- a/glib/glibmm-2.4.pc.in
+++ b/glib/glibmm-2.4.pc.in
@@ -5,7 +5,7 @@ datarootdir= datarootdir@
 includedir= includedir@
 
 gmmprocdir=${libdir}/@GLIBMM_MODULE_NAME@/proc
-doctooldir=${datadir}/@PACKAGE_TARNAME@/doctool
+doctooldir=${datadir}/@GLIBMM_MODULE_NAME@/doctool
 
 docdir=${datarootdir}/doc/@GLIBMM_MODULE_NAME@
 doxytagfile=${docdir}/reference/@GLIBMM_MODULE_NAME  tag