[glibmm] Provide documentation location via pkg-config

[Daniel Elstner <daniel src gnome org>]

commit 76b8fda19e11cbab868101befbe2912e31a1c220
Author: Daniel Elstner <danielk openismus com>
Date:   Mon Aug 10 08:41:23 2009 +0200

    Provide documentation location via pkg-config
    
    * glib/glibmm-2.4.pc.in: Clean up and modernize the values,
    and make use of more configure variable substitutions.
    (datarootdir): Substitute @datarootdir  
    (gmmprocdir): Remove the @GMMPROC_DIR@ substitution and expand
    ${libdir} indirectly.
    (doctooldir): New variable pointing to the location of the
    installed utilities for building the reference documentation.
    (docdir), (doxytagfile), (htmlrefdir), (htmlrefpub): Provide
    meta information on the installed reference documentation in
    these new pkg-config variables.
    * gio/giomm-2.4.pc.in: Clean up and modernize the values,
    and make use of more configure variable substitutions.
    (datarootdir): Substitute @datarootdir  
    (docdir), (doxytagfile), (htmlrefdir), (htmlrefpub): Provide
    meta information on the installed reference documentation in
    these new pkg-config variables.  The values are identical to
    the glibmm-2.4 ones because the documentation is bundled.
    * docs/Makefile.am (hmtlrefpub): Override the public web URL
    of the reference documentation, since the currently uploaded
    documentation still has the redundant docs/ component in the
    base path.

 ChangeLog             |   26 ++++++++++++++++++++++++++
 docs/Makefile.am      |    8 ++++++--
 gio/giomm-2.4.pc.in   |   17 ++++++++++++-----
 glib/glibmm-2.4.pc.in |   19 ++++++++++++++-----
 4 files changed, 58 insertions(+), 12 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3eef5c0..6d32f62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,31 @@
 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,
+	and make use of more configure variable substitutions.
+	(datarootdir): Substitute @datarootdir  
+	(gmmprocdir): Remove the @GMMPROC_DIR@ substitution and expand
+	${libdir} indirectly.
+	(doctooldir): New variable pointing to the location of the
+	installed utilities for building the reference documentation.
+	(docdir), (doxytagfile), (htmlrefdir), (htmlrefpub): Provide
+	meta information on the installed reference documentation in
+	these new pkg-config variables.
+	* gio/giomm-2.4.pc.in: Clean up and modernize the values,
+	and make use of more configure variable substitutions.
+	(datarootdir): Substitute @datarootdir  
+	(docdir), (doxytagfile), (htmlrefdir), (htmlrefpub): Provide
+	meta information on the installed reference documentation in
+	these new pkg-config variables.  The values are identical to
+	the glibmm-2.4 ones because the documentation is bundled.
+	* docs/Makefile.am (hmtlrefpub): Override the public web URL
+	of the reference documentation, since the currently uploaded
+	documentation still has the redundant docs/ component in the
+	base path.
+
+2009-08-09  Daniel Elstner  <danielk openismus com>
+
 	Get make distcheck to pass cleanly
 
 	* Makefile.am (DISTCLEANFILES): List the configuration header
diff --git a/docs/Makefile.am b/docs/Makefile.am
index eeaa4ff..9fd0702 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -20,13 +20,17 @@ include $(top_srcdir)/glib/glibmm/filelist.am
 include $(top_srcdir)/gio/src/filelist.am
 include $(top_srcdir)/gio/giomm/filelist.am
 
-glibmm_files_h = $(glibmm_files_built_h) $(glibmm_files_extra_h)
-giomm_files_h  = $(giomm_files_built_h) $(giomm_files_extra_h)
+glibmm_files_h = $(filter-out wrap_init.h,$(glibmm_files_built_h) $(glibmm_files_extra_h))
+giomm_files_h  = $(filter-out wrap_init.h,$(giomm_files_built_h) $(giomm_files_extra_h))
 
 book_name = $(GLIBMM_MODULE_NAME)
 doc_input = $(addprefix $(top_srcdir)/glib/glibmm/,$(glibmm_files_h)) \
             $(addprefix $(top_srcdir)/gio/giomm/,$(giomm_files_h))
 
+# Override the web location to use the old-style path with redundant
+# directory components.
+htmlrefpub = http://www.gtkmm.org/docs/$(book_name)/docs/reference/html
+
 # Override utility locations to point to the local files.
 doc_install         = $(PERL) -- $(srcdir)/doc-install.pl
 doc_postprocess     = $(PERL) -- $(srcdir)/doc-postprocess.pl
diff --git a/gio/giomm-2.4.pc.in b/gio/giomm-2.4.pc.in
index ac7d2e6..37a1e0e 100644
--- a/gio/giomm-2.4.pc.in
+++ b/gio/giomm-2.4.pc.in
@@ -1,11 +1,18 @@
 prefix= prefix@
 exec_prefix= exec_prefix@
 libdir= libdir@
+datarootdir= datarootdir@
 includedir= includedir@
 
+docdir=${datarootdir}/doc/@GLIBMM_MODULE_NAME@
+doxytagfile=${docdir}/reference/@GLIBMM_MODULE_NAME  tag
+htmlrefdir=${docdir}/reference/html
+htmlrefpub=http://www.gtkmm.org/docs/@GLIBMM_MODULE_NAME@/docs/reference/html
+
 Name: giomm
-Description: C++ wrapper for gio-standalone
-Requires: gio-2.0 glibmm-2.4
-Version: @VERSION@
-Libs: -L${libdir} -lgiomm-2.4
-Cflags: -I${includedir}/giomm-2.4 -I${libdir}/giomm-2.4/include
+Description: C++ binding for gio
+Version: @PACKAGE_VERSION@
+URL: http://www.gtkmm.org/
+Requires: gio-2.0 @GLIBMM_MODULE_NAME@
+Libs: -L${libdir} -lgiomm- GIOMM_API_VERSION@
+Cflags: -I${includedir}/@GIOMM_MODULE_NAME@ -I${libdir}/@GIOMM_MODULE_NAME@/include
diff --git a/glib/glibmm-2.4.pc.in b/glib/glibmm-2.4.pc.in
index 554651e..a1d2379 100644
--- a/glib/glibmm-2.4.pc.in
+++ b/glib/glibmm-2.4.pc.in
@@ -1,12 +1,21 @@
 prefix= prefix@
 exec_prefix= exec_prefix@
 libdir= libdir@
+datarootdir= datarootdir@
 includedir= includedir@
-gmmprocdir= GMMPROC_DIR@
 
-Name: GLibmm
+gmmprocdir=${libdir}/@GLIBMM_MODULE_NAME@/proc
+doctooldir=${datadir}/@PACKAGE_TARNAME@/doctool
+
+docdir=${datarootdir}/doc/@GLIBMM_MODULE_NAME@
+doxytagfile=${docdir}/reference/@GLIBMM_MODULE_NAME  tag
+htmlrefdir=${docdir}/reference/html
+htmlrefpub=http://www.gtkmm.org/docs/@GLIBMM_MODULE_NAME@/docs/reference/html
+
+Name: glibmm
 Description: C++ wrapper for GLib
+Version: @PACKAGE_VERSION@
+URL: http://www.gtkmm.org/
 Requires: gobject-2.0 sigc++-2.0
-Version: @VERSION@
-Libs: -L${libdir} -lglibmm-2.4
-Cflags: -I${includedir}/glibmm-2.4 -I${libdir}/glibmm-2.4/include
+Libs: -L${libdir} -lglibmm- GLIBMM_API_VERSION@
+Cflags: -I${includedir}/@GLIBMM_MODULE_NAME@ -I${libdir}/@GLIBMM_MODULE_NAME@/include