summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaun McCance <shaunm@gnome.org>2012-03-18 11:50:50 -0400
committerShaun McCance <shaunm@gnome.org>2012-03-18 11:50:50 -0400
commitdfe3b7a070aa983dbdf0c0db364de8bce724ba33 (patch)
treece91b2e1a1ef060abea519c7b7c5e79475b5b490
parent5f708cdab9295b1dbd2889afe18c6c898032cbcb (diff)
downloadgnome-doc-utils-dfe3b7a070aa983dbdf0c0db364de8bce724ba33.tar.gz
Remove remnants of RNG stuff
-rw-r--r--bootstrap.make4
-rw-r--r--tools/gnome-doc-utils.make5
-rw-r--r--tools/gnome-doc-utils.pc.in2
3 files changed, 2 insertions, 9 deletions
diff --git a/bootstrap.make b/bootstrap.make
index 1395ca5..44fbb62 100644
--- a/bootstrap.make
+++ b/bootstrap.make
@@ -2,10 +2,6 @@ _xml2po = PYTHONPATH="$(shell pwd)/$(top_builddir)/xml2po:$(shell pwd)/$(top_src
_db2html = $(top_srcdir)/xslt/docbook/html/db2html.xsl
_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
diff --git a/tools/gnome-doc-utils.make b/tools/gnome-doc-utils.make
index b923bb9..42d9df3 100644
--- a/tools/gnome-doc-utils.make
+++ b/tools/gnome-doc-utils.make
@@ -135,7 +135,6 @@ _xml2po_mode = $(if $(DOC_ID),mallard,docbook)
_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 ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl
@@ -545,8 +544,8 @@ check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES)
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"; \
+ echo "xmllint --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \
+ xmllint --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \
done; \
done
diff --git a/tools/gnome-doc-utils.pc.in b/tools/gnome-doc-utils.pc.in
index df859c7..86583b0 100644
--- a/tools/gnome-doc-utils.pc.in
+++ b/tools/gnome-doc-utils.pc.in
@@ -10,8 +10,6 @@ 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