[gnome-doc-utils] Adding Mallard build magic to gnome-doc-utils.make and elsewhere

From: Shaun McCance <shaunm src gnome org>
To: svn-commits-list gnome org
Subject: [gnome-doc-utils] Adding Mallard build magic to gnome-doc-utils.make and elsewhere
Date: Sun, 28 Jun 2009 03:15:22 +0000 (UTC)
commit 43a81c75f47baf7e4cb53047c289c4f5a25cd327
Author: Shaun McCance <shaunm gnome org>
Date:   Sat Jun 27 19:55:26 2009 -0500

    Adding Mallard build magic to gnome-doc-utils.make and elsewhere

 bootstrap.make              |    2 +
 configure.in                |    2 -
 doc/mallard/Makefile.am     |   81 +++++++++++++++++++++++++++-
 rng/mallard/Makefile.am     |   17 ++++--
 tools/gnome-doc-utils.make  |  124 ++++++++++++++++++++++++++++++++-----------
 tools/gnome-doc-utils.pc.in |    2 +
 6 files changed, 187 insertions(+), 41 deletions(-)
---
diff --git a/bootstrap.make b/bootstrap.make
index b26f758..ab15b90 100644
--- a/bootstrap.make
+++ b/bootstrap.make
@@ -5,6 +5,8 @@ _db2omf  = $(top_srcdir)/xslt/docbook/omf/db2omf.xsl
 _rngdoc  = $(top_srcdir)/xslt/rngdoc/rngdoc.xsl
 _xsldoc  = $(top_srcdir)/xslt/xsldoc/xsldoc.xsl
 
+_malrng  = $(top_builddir)/rng/mallard/mallard.rng
+
 _chunks  = $(top_srcdir)/xslt/docbook/utils/chunks.xsl
 _credits = $(top_srcdir)/xslt/docbook/utils/credits.xsl
 _ids     = $(top_srcdir)/xslt/docbook/utils/ids.xsl
diff --git a/configure.in b/configure.in
index 60d66de..12a939c 100644
--- a/configure.in
+++ b/configure.in
@@ -56,8 +56,6 @@ data/watermarks/Makefile
 doc/Makefile
 doc/gnome-doc-make/Makefile
 doc/mallard/Makefile
-doc/mallard/C/Makefile
-doc/mallard/C/figures/Makefile
 doc/xslt/Makefile
 po/Makefile.in
 rng/Makefile
diff --git a/doc/mallard/Makefile.am b/doc/mallard/Makefile.am
index 1487d19..093c32a 100644
--- a/doc/mallard/Makefile.am
+++ b/doc/mallard/Makefile.am
@@ -1,2 +1,81 @@
-SUBDIRS = C
+include $(top_srcdir)/tools/gnome-doc-utils.make
+include $(top_srcdir)/bootstrap.make
+dist-hook: doc-dist-hook
 
+DOC_ID = gnome-doc-mallard-spec
+
+DOC_INCLUDES = legal.xml
+
+DOC_FIGURES = figures/mallard.png
+
+DOC_LINGUAS = de
+
+DOC_PAGES =				\
+	details.page			\
+	docbook.page			\
+	explore.page			\
+	i18n.page			\
+	index.page			\
+	its.page			\
+	l10n.page			\
+	links.page			\
+	mal_attr_link.page		\
+	mal_block_cite.page		\
+	mal_block_code.page		\
+	mal_block_comment.page		\
+	mal_block_desc.page		\
+	mal_block_example.page		\
+	mal_block_figure.page		\
+	mal_block_listing.page		\
+	mal_block_list.page		\
+	mal_block_media.page		\
+	mal_block_note.page		\
+	mal_block.page			\
+	mal_block_p.page		\
+	mal_block_quote.page		\
+	mal_block_screen.page		\
+	mal_block_steps.page		\
+	mal_block_subtitle.page		\
+	mal_block_synopsis.page		\
+	mal_block_terms.page		\
+	mal_block_title.page		\
+	mal_block_tree.page		\
+	mal_external.page		\
+	mal_info_copyright.page		\
+	mal_info_credit.page		\
+	mal_info_desc.page		\
+	mal_info_license.page		\
+	mal_info_link.page		\
+	mal_info.page			\
+	mal_info_revision.page		\
+	mal_info_title.page		\
+	mal_inline_app.page		\
+	mal_inline_cmd.page		\
+	mal_inline_code.page		\
+	mal_inline_em.page		\
+	mal_inline_file.page		\
+	mal_inline_gui.page		\
+	mal_inline_guiseq.page		\
+	mal_inline_input.page		\
+	mal_inline_key.page		\
+	mal_inline_keyseq.page		\
+	mal_inline_link.page		\
+	mal_inline_media.page		\
+	mal_inline_output.page		\
+	mal_inline.page			\
+	mal_inline_span.page		\
+	mal_inline_sys.page		\
+	mal_inline_var.page		\
+	mal_page.page			\
+	mal_section.page		\
+	mal_table_col.page		\
+	mal_table.page			\
+	mal_table_td.page		\
+	mal_table_tr.page		\
+	mal_TODO.page			\
+	principle-guide.page		\
+	principle-justenough.page	\
+	principle-redundancy.page	\
+	principles.page			\
+	spec.page			\
+	tenminutes.page	
diff --git a/rng/mallard/Makefile.am b/rng/mallard/Makefile.am
index d5613e1..df26ae0 100644
--- a/rng/mallard/Makefile.am
+++ b/rng/mallard/Makefile.am
@@ -1,12 +1,12 @@
 all: mallard.rnc mallard.rng
 
-specs1=$(top_srcdir)/doc/mallard/C/mal_page.page   \
-       $(top_srcdir)/doc/mallard/C/mal_block.page  $(wildcard $(top_srcdir)/doc/mallard/C/mal_block_*.page) \
-       $(top_srcdir)/doc/mallard/C/mal_inline.page $(wildcard $(top_srcdir)/doc/mallard/C/mal_inline_*.page)
-specs=$(specs1) $(filter-out $(specs1), $(wildcard $(top_srcdir)/doc/mallard/C/*.page))
+_specs1=$(top_srcdir)/doc/mallard/C/mal_page.page   \
+        $(top_srcdir)/doc/mallard/C/mal_block.page  $(wildcard $(top_srcdir)/doc/mallard/C/mal_block_*.page) \
+        $(top_srcdir)/doc/mallard/C/mal_inline.page $(wildcard $(top_srcdir)/doc/mallard/C/mal_inline_*.page)
+_specs=$(_specs1) $(filter-out $(_specs1), $(wildcard $(top_srcdir)/doc/mallard/C/*.page))
 
 mallard.rnc: $(wildcard $(top_srcdir)/doc/mallard/C/*.page)
-	for file in $(specs); do \
+	for file in $(_specs); do \
 	  xsltproc $(srcdir)/mal2rnc.xsl $$file; \
 	done > mallard.rnc
 
@@ -20,5 +20,10 @@ mallard.rng: mallard.rnc rnc2rng.awk
 	      -e 's/^<d/\n<d/' \
 	  > $@ || ( rm -f $  tmp && exit 1 ) && rm -f $  tmp
 
-EXTRA_DIST = mal2rnc.xsl rnc2rng.awk mallard.rnc mallard.rng
+specdir = $(datadir)/xml/mallard/1.0/
+spec_DATA = mallard.rnc mallard.rng
 
+EXTRA_DIST = mal2rnc.xsl rnc2rng.awk
+
+CLEANFILES = $(spec_DATA)
+DISTCLEANFILES = $(spec_DATA)
diff --git a/tools/gnome-doc-utils.make b/tools/gnome-doc-utils.make
index b7ea210..ecbd4ac 100644
--- a/tools/gnome-doc-utils.make
+++ b/tools/gnome-doc-utils.make
@@ -92,6 +92,14 @@ all: $(DOC_H_FILE)
 ## The name of the document being built
 DOC_MODULE ?=
 
+## @ DOC_ID
+## The unique identifier for a Mallard document
+DOC_ID ?=
+
+## @ DOC_PAGES
+## Page files in a Mallard document
+DOC_PAGES ?=
+
 ## @ DOC_ENTITIES
 ## Files included with a SYSTEM entity
 DOC_ENTITIES ?=
@@ -126,6 +134,7 @@ _xml2po ?= `which xml2po`
 
 _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
 _db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
 _chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
 _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
 _ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
@@ -205,6 +214,10 @@ omf: $(_DOC_OMF_ALL)
 ## The top-level documentation file in the C locale
 _DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
 
+## @ _DOC_C_PAGES
+## Page files in a Mallard document in the C locale
+_DOC_C_PAGES = $(foreach page,$(DOC_PAGES),C/$(page))
+
 ## @ _DOC_C_ENTITIES
 ## Files included with a SYSTEM entity in the C locale
 _DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent))
@@ -217,13 +230,14 @@ _DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc))
 ## All documentation files in the C locale
 _DOC_C_DOCS =								\
 	$(_DOC_C_ENTITIES)	$(_DOC_C_INCLUDES)			\
-	$(_DOC_C_MODULE)
+	$(_DOC_C_PAGES)		$(_DOC_C_MODULE)
 
 ## @ _DOC_C_DOCS_NOENT
 ## All documentation files in the C locale,
 ## except files included with a SYSTEM entity
 _DOC_C_DOCS_NOENT =							\
-	$(_DOC_C_MODULE)	$(_DOC_C_INCLUDES)
+	$(_DOC_C_MODULE)	$(_DOC_C_INCLUDES)			\
+	$(_DOC_C_PAGES)
 
 ## @ _DOC_C_FIGURES
 ## All figures and other external data in the C locale
@@ -245,7 +259,7 @@ _DOC_C_HTML = $(foreach f,						\
 
 ## @ _DOC_POFILES
 ## The .po files used for translating the document
-_DOC_POFILES = $(if $(DOC_MODULE),						\
+_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID),					\
 	$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po))
 
 .PHONY: po
@@ -256,6 +270,12 @@ po: $(_DOC_POFILES)
 _DOC_LC_MODULES = $(if $(DOC_MODULE),						\
 	$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml))
 
+## @ _DOC_LC_PAGES
+## Page files in a Mallard document in all other locales
+_DOC_LC_PAGES =									\
+	$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach page,$(_DOC_C_PAGES),	\
+		$(lc)/$(notdir $(page)) ))
+
 ## @ _DOC_LC_XINCLUDES
 ## Files included with XInclude in all other locales
 _DOC_LC_INCLUDES =								\
@@ -272,7 +292,7 @@ _DOC_LC_HTML =									\
 ## @ _DOC_LC_DOCS
 ## All documentation files in all other locales
 _DOC_LC_DOCS =									\
-	$(_DOC_LC_MODULES)	$(_DOC_LC_INCLUDES)				\
+	$(_DOC_LC_MODULES)	$(_DOC_LC_INCLUDES)	$(_DOC_LC_PAGES)	\
 	$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
 
 ## @ _DOC_LC_FIGURES
@@ -317,9 +337,10 @@ $(_DOC_LC_DOCS) : $(_DOC_POFILES)
 $(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
 	if ! test -d $(dir $@); then mkdir $(dir $@); fi
 	if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
+	po="$(dir $@)$(patsubst %/$(notdir $@),%,$@).po"; \
+	if [ -f "$${po}" ]; then po="../$${po}"; else po="$(_DOC_ABS_SRCDIR)/$${po}"; fi; \
 	(cd $(dir $@) && \
-	  $(_xml2po) -e -p \
-	    "$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po" \
+	  $(_xml2po) -e -p "$${po}" \
 	    "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
 	    cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
 
@@ -347,6 +368,7 @@ $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
 
 
 ################################################################################
+## All
 
 all:							\
 	$(_DOC_C_DOCS)		$(_DOC_LC_DOCS)		\
@@ -354,6 +376,9 @@ all:							\
 	$(_DOC_HTML_ALL)	$(_DOC_POFILES)
 
 
+################################################################################
+## Clean
+
 .PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
 
 clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML)
@@ -385,7 +410,7 @@ clean-doc-dir:
 _clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
 _clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
 _clean_lc  = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
-_clean_dir = $(if $(DOC_MODULE),clean-doc-dir)
+_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
 
 clean-local:						\
 	$(_clean_omf)		$(_clean_dsk)		\
@@ -401,10 +426,14 @@ maintainer-clean-local:					\
 	$(_clean_lc)		$(_clean_dir)
 
 
-.PHONY: dist-doc-docs dist-doc-figs dist-doc-omf dist-doc-dsk
-doc-dist-hook: 					\
-	$(if $(DOC_MODULE),dist-doc-docs)	\
-	$(if $(_DOC_C_FIGURES),dist-doc-figs)	\
+
+################################################################################
+## Dist
+
+.PHONY: dist-doc-docs dist-doc-pages dist-doc-figs dist-doc-omf dist-doc-dsk
+doc-dist-hook: 						\
+	$(if $(DOC_MODULE)$(DOC_ID),dist-doc-docs)	\
+	$(if $(_DOC_C_FIGURES),dist-doc-figs)		\
 	$(if $(_DOC_OMF_IN),dist-doc-omf)
 #	$(if $(_DOC_DSK_IN),dist-doc-dsk)
 
@@ -451,9 +480,14 @@ dist-doc-dsk:
 	$(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))"
 
 
+
+################################################################################
+## Check
+
 .PHONY: check-doc-docs check-doc-omf
 check:							\
 	$(if $(DOC_MODULE),check-doc-docs)		\
+	$(if $(DOC_ID),check-doc-pages)			\
 	$(if $(_DOC_OMF_IN),check-doc-omf)
 
 check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
@@ -469,6 +503,21 @@ check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
 	  xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \
 	done
 
+check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES)
+	for lc in C $(_DOC_REAL_LINGUAS); do \
+	  if test -f "$$lc"; \
+	    then d=; \
+	    xmlpath="$$lc"; \
+	  else \
+	    d="$(srcdir)/"; \
+	    xmlpath="$$lc:$(srcdir)/$$lc"; \
+	  fi; \
+	  for page in $(DOC_PAGES); do \
+	    echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \
+	    xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \
+	  done; \
+	done
+
 check-doc-omf: $(_DOC_OMF_ALL)
 	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
 	  echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
@@ -476,9 +525,16 @@ check-doc-omf: $(_DOC_OMF_ALL)
 	done
 
 
+
+################################################################################
+## Install
+
 .PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
+
+_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
+
 install-data-local:					\
-	$(if $(DOC_MODULE),install-doc-docs)		\
+	$(if $(DOC_MODULE)$(DOC_ID),install-doc-docs)	\
 	$(if $(_DOC_HTML_ALL),install-doc-html)		\
 	$(if $(_DOC_C_FIGURES),install-doc-figs)	\
 	$(if $(_DOC_OMF_IN),install-doc-omf)
@@ -486,19 +542,19 @@ install-data-local:					\
 
 install-doc-docs:
 	@for lc in C $(_DOC_REAL_LINGUAS); do \
-	  echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc"; \
-	  $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc; \
+	  echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \
+	  $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \
 	done
 	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
 	  if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
 	  docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-	  docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
+	  docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \
 	  if ! test -d "$$docdir"; then \
 	    echo "$(mkinstalldirs) $$docdir"; \
 	    $(mkinstalldirs) "$$docdir"; \
 	  fi; \
-	  echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
-	  $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
+	  echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
+	  $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \
 	done
 
 install-doc-figs:
@@ -513,7 +569,7 @@ install-doc-figs:
 	      figsymlink=true; \
 	    fi; \
 	    figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-	    figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \
+	    figdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$figdir"; \
 	    if ! test -d "$$figdir"; then \
 	      echo "$(mkinstalldirs) $$figdir"; \
 	      $(mkinstalldirs) "$$figdir"; \
@@ -533,23 +589,27 @@ install-doc-html:
 	echo install-html
 
 install-doc-omf:
-	$(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)
+	$(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)
 	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-	  echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-	  $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf; \
+	  echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
+	  $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf; \
 	done
 	@if test "x$(_ENABLE_SK)" = "xtrue"; then \
-	  echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \
-	  scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \
+	  echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
+	  scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
 	fi;
 
 install-doc-dsk:
 	echo install-dsk
 
 
+
+################################################################################
+## Uninstall
+
 .PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk
 uninstall-local:					\
-	$(if $(DOC_MODULE),uninstall-doc-docs)		\
+	$(if $(DOC_MODULE)$(DOC_ID),uninstall-doc-docs)	\
 	$(if $(_DOC_HTML_ALL),uninstall-doc-html)	\
 	$(if $(_DOC_C_FIGURES),uninstall-doc-figs)	\
 	$(if $(_DOC_OMF_IN),uninstall-doc-omf)
@@ -557,22 +617,22 @@ uninstall-local:					\
 
 uninstall-doc-docs:
 	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
-	  echo " rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
-	  rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
+	  echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
+	  rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
 	done
 
 uninstall-doc-figs:
 	@list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \
-	  echo "rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \
-	  rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \
+	  echo "rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
+	  rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
 	done;
 
 uninstall-doc-omf:
 	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
 	  if test "x$(_ENABLE_SK)" = "xtrue"; then \
-	    echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-	    scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
+	    echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
+	    scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
 	  fi; \
-	  echo "rm -f $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-	  rm -f "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
+	  echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
+	  rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
 	done
diff --git a/tools/gnome-doc-utils.pc.in b/tools/gnome-doc-utils.pc.in
index 86583b0..df859c7 100644
--- a/tools/gnome-doc-utils.pc.in
+++ b/tools/gnome-doc-utils.pc.in
@@ -10,6 +10,8 @@ db2xhtml=${xsltdir}/docbook/html/db2xhtml.xsl
 db2omf=${xsltdir}/docbook/omf/db2omf.xsl
 mal2html=${xsltdir}/mallard/html/mal2html.xsl
 mal2xhtml=${xsltdir}/mallard/html/mal2xhtml.xsl
+malrnc=${xmldir}/mallard/1.0/mallard.rnc
+malrng=${xmldir}/mallard/1.0/mallard.rng
 
 Name: gnome-doc-utils
 Description: GNOME Documentation Utilities
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]