[mm-common] Work around empty instantiation of $(doc_outdir)
- From: Daniel Elstner <daniel src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [mm-common] Work around empty instantiation of $(doc_outdir)
- Date: Sat, 12 Dec 2009 10:12:51 +0000 (UTC)
commit 59fc9033f83eb2e34efeca61995bdc9fc50cb7cd
Author: Daniel Elstner <daniel kitta gmail com>
Date: Sat Dec 12 10:58:42 2009 +0100
Work around empty instantiation of $(doc_outdir)
* build/doc-reference.am (doxytagfile), (devhelpfile): Conditionally
assign these variables, thus making them overridable. For some weird
reason this helps to avoid a premature instantiation of $(doc_outdir)
with the empty string as content. (bgo#604222)
build/doc-reference.am | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/build/doc-reference.am b/build/doc-reference.am
index 88ec478..925a53f 100644
--- a/build/doc-reference.am
+++ b/build/doc-reference.am
@@ -18,7 +18,7 @@
## Parameters: book_name
## Overrides: pubdocbase, htmlrefpub, book_title, htmlref_patterns,
## doc_outdir, doc_config, doc_postprocess, doc_install,
-## tagfile_to_devhelp2
+## tagfile_to_devhelp2, doxytagfile, devhelpfile
## Files: doc_input
## Output: dist_noinst_DATA, DISTCLEANFILES, MAINTAINERCLEANFILES
@@ -51,8 +51,8 @@ doc_install ?= $(PERL) -- "$(MMDOCTOOLDIR)/doc-install.pl"
tagfile_to_devhelp2 ?= "$(MMDOCTOOLDIR)/tagfile-to-devhelp2.xsl"
# Names of the main output files.
-doxytagfile = $(doc_outdir)/$(book_name).tag
-devhelpfile = $(doc_outdir)/$(book_name).devhelp2
+doxytagfile ?= $(doc_outdir)/$(book_name).tag
+devhelpfile ?= $(doc_outdir)/$(book_name).devhelp2
# Function: $(call vpath_listall,PATTERN ...)
# Get all filenames which match a PATTERN from the list. Look for files
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]