[libsigc++2] Remove now superfluous doctool overrides

[Daniel Elstner <daniel src gnome org>]

commit 2541e35e8f1c9acda7fddb7d09b7791db338bcad
Author: Daniel Elstner <danielk openismus com>
Date:   Tue Aug 11 02:35:33 2009 +0200

    Remove now superfluous doctool overrides
    
    * docs/Makefile.am: Remove overrides for the documentation
    utilities, since MM_CONFIG_DOCTOOL_DIR() already takes care
    of setting MMDOCTOOLDIR to the local directory.
    * sigc++-2.0.pc.in (datadir): Substitute value, just in case.

 ChangeLog        |   11 ++++++++++-
 docs/Makefile.am |    5 -----
 sigc++-2.0.pc.in |    3 ++-
 3 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a040804..024e948 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,13 @@
-2009-08-09  Daniel Elstner  <danielk openismus com>
+2009-08-11  Daniel Elstner  <danielk openismus com>
+
+	Remove now superfluous doctool overrides
+
+	* docs/Makefile.am: Remove overrides for the documentation
+	utilities, since MM_CONFIG_DOCTOOL_DIR() already takes care
+	of setting MMDOCTOOLDIR to the local directory.
+	* sigc++-2.0.pc.in (datadir): Substitute value, just in case.
+
+2009-08-10  Daniel Elstner  <danielk openismus com>
 
 	Have mm-common-prepare install the doc utils
 
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 213d3ea..1b85129 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -24,11 +24,6 @@ htmlrefpub = $(pubdocbase)libsigc2/docs/reference/html
 doc_input = $(addprefix $(top_srcdir)/sigc++/,$(sigc_public_h)) \
 	    $(addprefix $(top_builddir)/sigc++/,$(sigc_built_h))
 
-# Override utility locations to point to the local files.
-doc_install         = $(PERL) -- $(top_srcdir)/scripts/doc-install.pl
-doc_postprocess     = $(PERL) -- $(top_srcdir)/scripts/doc-postprocess.pl
-tagfile_to_devhelp2 = $(top_srcdir)/scripts/tagfile-to-devhelp2.xsl
-
 include $(top_srcdir)/scripts/doc-reference.am
 
 doc_imagesdir = $(libdocdir)/images
diff --git a/sigc++-2.0.pc.in b/sigc++-2.0.pc.in
index d1133ee..41d2b72 100644
--- a/sigc++-2.0.pc.in
+++ b/sigc++-2.0.pc.in
@@ -1,8 +1,9 @@
 prefix= prefix@
 exec_prefix= exec_prefix@
 libdir= libdir@
-includedir= includedir@
 datarootdir= datarootdir@
+datadir= datadir@
+includedir= includedir@
 
 docdir=${datarootdir}/doc/libsigc++- SIGCXX_API_VERSION@
 doxytagfile=${docdir}/reference/libsigc++- SIGCXX_API_VERSION@.tag