diff options
| author | Shaun McCance <shaunm@src.gnome.org> | 2007-04-09 18:04:19 +0000 |
|---|---|---|
| committer | Shaun McCance <shaunm@src.gnome.org> | 2007-04-09 18:04:19 +0000 |
| commit | 80013f671b96ce1aabb52f85663d3a2c1bf2acd2 (patch) | |
| tree | 1af49f66d8fd9e3d9d1f983709a516ca0e9de568 | |
| parent | f67b59a20a3d89d32d9a88d00f3b5902e0ef6c89 (diff) | |
| download | gnome-doc-utils-80013f671b96ce1aabb52f85663d3a2c1bf2acd2.tar.gz | |
- Fix error on category code check with --disable-scrollkeeper (#427939)
* tools/gnome-doc-utils.make:
- Fix error on category code check with --disable-scrollkeeper (#427939)
svn path=/trunk/; revision=913
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | tools/gnome-doc-utils.make | 16 |
2 files changed, 12 insertions, 9 deletions
@@ -1,5 +1,10 @@ 2007-04-09 Shaun McCance <shaunm@gnome.org> + * tools/gnome-doc-utils.make: + - Fix error on category code check with --disable-scrollkeeper (#427939) + +2007-04-09 Shaun McCance <shaunm@gnome.org> + * configure.in: * NEWS: - Version 0.10.2 diff --git a/tools/gnome-doc-utils.make b/tools/gnome-doc-utils.make index 882b84d..a5279cc 100644 --- a/tools/gnome-doc-utils.make +++ b/tools/gnome-doc-utils.make @@ -131,6 +131,7 @@ _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook _ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl if ENABLE_SK +_ENABLE_SK = true _skpkgdatadir ?= `scrollkeeper-config --pkgdatadir` _sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir` _skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml @@ -150,7 +151,8 @@ db2omf_args = \ --stringparam db2omf.omf_dir "$(OMF_DIR)" \ --stringparam db2omf.help_dir "$(HELP_DIR)" \ --stringparam db2omf.omf_in "$(_DOC_OMF_IN)" \ - --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)" \ + $(if $(_ENABLE_SK), \ + --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)") \ $(_db2omf) $(2) ## @ _DOC_OMF_IN @@ -164,7 +166,7 @@ _DOC_OMF_DB = $(if $(_DOC_OMF_IN), \ $(_DOC_OMF_DB) : $(_DOC_OMF_IN) $(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml - @test -f "$(_skcontentslist)" || { \ + @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \ echo "The file '$(_skcontentslist)' does not exist." >&2; \ echo "Please check your ScrollKeeper installation." >&2; \ exit 1; } @@ -177,10 +179,12 @@ _DOC_OMF_HTML = $(if $(_DOC_OMF_IN), \ $(_DOC_OMF_HTML) : $(_DOC_OMF_IN) $(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml - @test -f "$(_skcontentslist)" || { \ +if ENABLE_SK + @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \ echo "The file '$(_skcontentslist)' does not exist" >&2; \ echo "Please check your ScrollKeeper installation." >&2; \ exit 1; } +endif xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } ## @ _DOC_OMF_ALL @@ -344,12 +348,6 @@ $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) ################################################################################ -if ENABLE_SK -_ENABLE_SK = true -else -_ENABLE_SK = false -endif - all: \ $(_DOC_C_DOCS) $(_DOC_LC_DOCS) \ $(_DOC_OMF_ALL) $(_DOC_DSK_ALL) \ |