diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | docs/Makefile.am | 5 | ||||
| -rw-r--r-- | gio/giomm-2.4.pc.in | 1 | ||||
| -rw-r--r-- | glib/glibmm-2.4.pc.in | 1 |
4 files changed, 13 insertions, 5 deletions
@@ -1,3 +1,14 @@ +2009-08-11 Daniel Elstner <danielk@openismus.com> + + Add missing datadir substitution to .pc file + + * glib/glibmm-2.4.pc.in (datadir): Substitute value, as it is + used as a component of doctooldir later in the file. + * gio/giomm-2.4.pc.in (datadir): Substitute value, just in case. + * docs/Makefile.am: Remove overrides of the documentation + utilities, since MM_CONFIG_DOCTOOL_DIR() already takes care + of setting MMDOCTOOLDIR to the local directory. + 2009-08-10 Daniel Elstner <danielk@openismus.com> Get rid of some old Autoconf macro cruft diff --git a/docs/Makefile.am b/docs/Makefile.am index 149c944c..e48e9e9b 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -31,11 +31,6 @@ doc_input = $(addprefix $(top_srcdir)/glib/glibmm/,$(glibmm_files_h)) \ # 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 -tagfile_to_devhelp2 = $(srcdir)/tagfile-to-devhelp2.xsl - doctooldir = $(datadir)/$(GLIBMM_MODULE_NAME)/doctool dist_doctool_DATA = doc-postprocess.pl doc-install.pl tagfile-to-devhelp2.xsl diff --git a/gio/giomm-2.4.pc.in b/gio/giomm-2.4.pc.in index 37a1e0e1..87e23d15 100644 --- a/gio/giomm-2.4.pc.in +++ b/gio/giomm-2.4.pc.in @@ -2,6 +2,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ datarootdir=@datarootdir@ +datadir=@datadir@ includedir=@includedir@ docdir=${datarootdir}/doc/@GLIBMM_MODULE_NAME@ diff --git a/glib/glibmm-2.4.pc.in b/glib/glibmm-2.4.pc.in index ba4ee3d6..1a4ae1b7 100644 --- a/glib/glibmm-2.4.pc.in +++ b/glib/glibmm-2.4.pc.in @@ -2,6 +2,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ datarootdir=@datarootdir@ +datadir=@datadir@ includedir=@includedir@ gmmprocdir=${libdir}/@GLIBMM_MODULE_NAME@/proc |