[mm-common] Do not set default Devhelp base path to HTTP URL



commit ee6052c873bd337ec8ef0059425e8aed0af968b8
Author: Daniel Elstner <daniel kitta gmail com>
Date:   Sat Sep 26 19:17:30 2009 +0200

    Do not set default Devhelp base path to HTTP URL
    
    * build/doc-reference.am (dh_xsl_params): Do not set the Devhelp base
    attribute to the public Web location of the documentation by default.
    This made it look as though Devhelp supports anything but local paths
    for the base attribute, which it does not.
    (htmlref_patterns): Use $(addprefix) function to avoid repetition.
    (docdir_base_uri): Strip trailing slash from $(datarootdir).

 build/doc-reference.am |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/build/doc-reference.am b/build/doc-reference.am
index 2a54cb0..55dd217 100644
--- a/build/doc-reference.am
+++ b/build/doc-reference.am
@@ -34,11 +34,7 @@ book_title ?= $(PACKAGE_NAME) Reference Manual
 
 # A list of wildcard patterns matching the files from the HTML directory
 # generated by Doxygen which should be distributed and installed.
-htmlref_patterns ?=		\
-	reference/html/*.html	\
-	reference/html/*.css	\
-	reference/html/*.png	\
-	reference/html/*.gif
+htmlref_patterns ?= $(addprefix reference/html/*.,css gif html png)
 
 # Locations of utilities shipped with glibmm.  Made overridable
 # in case the installed utilities cannot be used for some reason.
@@ -72,9 +68,9 @@ MAINTAINERCLEANFILES = $(doxytagfile) $(devhelpfile) reference/html/*
 # The generic bit of the doc-install.pl command line.
 doc_install_cmd = $(doc_install) --verbose --mode=0644
 
-# Turn $(datarootdir) into a URI to match MM_ARG_WITH_TAGFILE_DOC().
+# Transform $(datarootdir) into a URI to match MM_ARG_WITH_TAGFILE_DOC().
 datarootdir_esc = $(subst $(subst ,, ),%20,$(subst \,/,$(datarootdir)))
-docdir_base_uri = file:///$(patsubst /%,%,$(datarootdir_esc))/doc
+docdir_base_uri = file:///$(patsubst /%,%,$(datarootdir_esc:/=))/doc
 
 # The command and options used to install the files from the HTML reference
 # documentation.  The $(subst) magic translates external tag references from
@@ -88,7 +84,7 @@ devhelp_install = $(doc_install_cmd) --book-base='$(htmlrefdir:/=)'
 
 # Helper variables to replicate each pattern with a $(srcdir)/ prefix.
 # Also add quoting to prevent the shell from expanding the patterns.
-htmlref_patterns_dup   = $(foreach file,$(htmlref_patterns),'$(file)' '$(srcdir)/$(file)')
+htmlref_patterns_dup   = $(foreach item,$(htmlref_patterns),'$(item)' '$(srcdir)/$(item)')
 htmlref_patterns_quote = $(patsubst %,'%',$(htmlref_patterns))
 htmlref_patterns_vpath = $(if $(srcdir:.=),$(htmlref_patterns_dup),$(htmlref_patterns_quote))
 
@@ -98,7 +94,7 @@ htmlref_find_patterns = $(patsubst %,-name '%' -o,$(notdir $(htmlref_patterns)))
 # The parameters to the Doxygen-to-Devhelp XSLT script
 dh_xsl_params =	--stringparam book_title '$(book_title)' \
 		--stringparam book_name '$(book_name)' \
-		--stringparam book_base '$(htmlrefpub:/=)'
+		--stringparam book_base html
 
 # Generated configuration files which, when updated, should cause the
 # reference documentation to be rebuilt.
@@ -166,7 +162,8 @@ reference/html/%: | $(doxytagfile)
 $(doxytagfile): $(doc_dependencies) | reference/Doxyfile
 	-$(AM_V_at)rm -f $@
 	-$(AM_V_at)rm -fr reference/html
-	$(AM_V_GEN)(echo '@INCLUDE =' reference/Doxyfile && echo 'INPUT =' $(doc_input)) | $(DOXYGEN) -
+	$(AM_V_GEN)(echo '@INCLUDE =' reference/Doxyfile && \
+	 echo 'INPUT =' $(doc_input)) | $(DOXYGEN) -
 	$(AM_V_at)$(doc_postprocess) 'reference/html/*.html'
 
 # Run XSL transformation to generate a Devhelp book from a Doxygen tag file.



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]