diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | docs/Makefile.am | 2 | ||||
| -rw-r--r-- | glib/glibmm-2.4.pc.in | 2 |
3 files changed, 11 insertions, 2 deletions
@@ -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 9fd07028..149c944c 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 a1d2379a..ba4ee3d6 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 |