diff options
| author | Shaun McCance <shaunm@src.gnome.org> | 2006-11-10 17:52:33 +0000 |
|---|---|---|
| committer | Shaun McCance <shaunm@src.gnome.org> | 2006-11-10 17:52:33 +0000 |
| commit | 52f1109ab80100310fcfe8b49828cd374b219cae (patch) | |
| tree | f1940dad464812bf52f710d0d4a2639095e247b6 | |
| parent | d0c3e2c46fecb04b3b22ad31cdecacea50f16122 (diff) | |
| download | gnome-doc-utils-52f1109ab80100310fcfe8b49828cd374b219cae.tar.gz | |
- Added a check for the scrollkeeper_cl.xml file
* gnome-doc-utils.make:
- Added a check for the scrollkeeper_cl.xml file
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | gnome-doc-utils.make | 12 |
2 files changed, 15 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2006-11-10 Shaun McCance <shaunm@gnome.org> + + * gnome-doc-utils.make: + - Added a check for the scrollkeeper_cl.xml file + 2006-11-09 Shaun McCance <shaunm@gnome.org> * gnome-doc-utils.make: diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make index 94df70a..ba28a07 100644 --- a/gnome-doc-utils.make +++ b/gnome-doc-utils.make @@ -124,6 +124,7 @@ _ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/uti _skpkgdatadir ?= `scrollkeeper-config --pkgdatadir` _sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir` +_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml ################################################################################ @@ -139,8 +140,7 @@ db2omf_args = \ --stringparam db2omf.omf_dir "$(OMF_DIR)" \ --stringparam db2omf.help_dir "$(HELP_DIR)" \ --stringparam db2omf.omf_in "`pwd`/$(_DOC_OMF_IN)" \ - --stringparam db2omf.scrollkeeper_cl \ - "$(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml" \ + --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)" \ $(_db2omf) $(2) ## @ _DOC_OMF_IN @@ -154,6 +154,10 @@ _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)" || { \ + echo "The file '$(_skcontentslist)' does not exist." >&2; \ + echo "Please check your ScrollKeeper installation." >&2; \ + exit 1; } xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } ## @ _DOC_OMF_HTML @@ -163,6 +167,10 @@ _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)" || { \ + echo "The file '$(_skcontentslist)' does not exist" >&2; \ + echo "Please check your ScrollKeeper installation." >&2; \ + exit 1; } xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } ## @ _DOC_OMF_ALL |