[mm-common] Use $(MMDOCTOOLDIR) instead of @MMDOCTOOLDIR@ in Doxyfile.in.

[Kjell Ahlstedt <kjellahl src gnome org>]

commit 3ccbc0235e0b67c66a8c655fb53f3de4a540badc
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Mon Jul 23 16:34:32 2012 +0200

    Use $(MMDOCTOOLDIR) instead of @MMDOCTOOLDIR@ in Doxyfile.in.
    
    MM_CONFIG_DOCTOOL_DIR([doc]) defines MMDOCTOOLDIR=${top_srcdir}/doc, which
    Doxygen does not understand, if it's substituted into Doxyfile. Let 'make' do
    the necessary recursive substitutions and export the result to Doxygen in the
    environment variable MMDOCTOOLDIR.
    
    * build/doc-reference.am: Export MMDOCTOOLDIR to Doxygen.
    * skeletonmm/configure.ac: Add MM_CONFIG_DOCTOOL_DIR([doc]).
    * skeletonmm/doc/reference/Doxyfile.in: Replace @MMDOCTOOLDIR@ by
    $(MMDOCTOOLDIR). Bug #673984.

 build/doc-reference.am               |    3 ++-
 skeletonmm/configure.ac              |    4 ++++
 skeletonmm/doc/reference/Doxyfile.in |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/build/doc-reference.am b/build/doc-reference.am
index 2c6a429..47e24fa 100644
--- a/build/doc-reference.am
+++ b/build/doc-reference.am
@@ -189,10 +189,11 @@ $(doc_outdir)/html/%: | $(doxytagfile)
 # also functions as time stamp target for the documentation as a whole.
 # Quote $(DOXYGEN) so that this still works if this is a path containing
 # spaces such as "/c/Program Files (x86)/Doxygen/bin/doxygen"
+# The doc_config file may contain "$(MMDOCTOOLDIR)". Export MMDOCTOOLDIR to Doxygen.
 $(doxytagfile): $(doc_dependencies) | $(doc_config)
 	-$(AM_V_at)rm -f $@
 	-$(AM_V_at)rm -fr $(doc_outdir)/html
-	$(AM_V_GEN)(echo '@INCLUDE =' $(doc_config) && echo 'INPUT =' $(doc_input)) | "$(DOXYGEN)" -
+	$(AM_V_GEN)(echo '@INCLUDE =' $(doc_config) && echo 'INPUT =' $(doc_input)) | MMDOCTOOLDIR="$(MMDOCTOOLDIR)" "$(DOXYGEN)" -
 	$(AM_V_at)$(doc_postprocess) '$(doc_outdir)/html/*.html'
 
 # Run XSL transformation to generate a Devhelp book from a Doxygen tag file.
diff --git a/skeletonmm/configure.ac b/skeletonmm/configure.ac
index 7f1f785..d6fb6b8 100644
--- a/skeletonmm/configure.ac
+++ b/skeletonmm/configure.ac
@@ -32,6 +32,10 @@ AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
 MM_PREREQ([0.9])
 MM_INIT_MODULE([skeletonmm-1.0])
 
+# Copy the mm-common .pl scripts into doc/, and use them from there,
+# so we can dist them to avoid a tarball-build dependency.
+MM_CONFIG_DOCTOOL_DIR([doc])
+
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 AC_SUBST([SKELETONMM_SO_VERSION], [0:0:0])
 
diff --git a/skeletonmm/doc/reference/Doxyfile.in b/skeletonmm/doc/reference/Doxyfile.in
index 1cf3306..f7904d7 100644
--- a/skeletonmm/doc/reference/Doxyfile.in
+++ b/skeletonmm/doc/reference/Doxyfile.in
@@ -142,7 +142,7 @@ HTML_OUTPUT            = html
 HTML_FILE_EXTENSION    = .html
 HTML_HEADER            =
 HTML_FOOTER            =
-HTML_STYLESHEET        = "@MMDOCTOOLDIR@/doxygen.css"
+HTML_STYLESHEET        = "$(MMDOCTOOLDIR)/doxygen.css"
 HTML_ALIGN_MEMBERS     = YES
 HTML_DYNAMIC_SECTIONS  = NO
 GENERATE_DOCSET        = NO