From 38241cec7bef169bff79df5ffb2c20d62cecb1d0 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 14 May 2008 01:44:39 +0000 Subject: [PATCH] myplc-docs build from local dtds - more robust, and much faster too --- doc/Makefile | 16 ++++++++++++++++ doc/{myplc.xml => myplc.xml.in} | 2 +- myplc-native.spec | 3 +-- 3 files changed, 18 insertions(+), 3 deletions(-) rename doc/{myplc.xml => myplc.xml.in} (99%) diff --git a/doc/Makefile b/doc/Makefile index 5c09b91..feb5a7c 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -9,6 +9,22 @@ all: myplc.html +# XML - as opposed to SGML - requires an identifier - see +# http://www.docbook.org/tdg/en/html/appb.html +# and, openjade opens http connections when using the official URL +# as an identifier; this is slow, and sometimes fails and breaks the build + +# locating locally installed docbook43 dtd - fedora-specific +remote-docbook-43 = http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd +local-docbook-43 = $(wildcard /usr/share/sgml/docbook/xml-dtd-4.3-*/docbookx.dtd) +docbook-43=$(if $(local-docbook-43),$(local-docbook-43),$(remote-docbook-43)) + +myplc.xml: myplc.xml.in + $(if $(local-docbook-43), \ + echo Using locally installed DTD $(local-docbook-43), \ + echo WARNING - could not locate local DTD - using remote $(remote-docbook-43)) + sed -e s:@DOCBOOK-43@:$(docbook-43): $< > $@ + # Dependencies .myplc.xml.valid: architecture.eps architecture.png plc_variables.xml diff --git a/doc/myplc.xml b/doc/myplc.xml.in similarity index 99% rename from doc/myplc.xml rename to doc/myplc.xml.in index 9ce2cd9..3289098 100644 --- a/doc/myplc.xml +++ b/doc/myplc.xml.in @@ -1,6 +1,6 @@ ]>
diff --git a/myplc-native.spec b/myplc-native.spec index 0a55a43..dce41d4 100644 --- a/myplc-native.spec +++ b/myplc-native.spec @@ -69,8 +69,7 @@ Requires: PLCWWW Requires: nodeconfig Requires: PLCAPI Requires: bootstrapfs-%{pldistro}-%{_arch} -#tmp, while we get the doc's build fixed -#Requires: myplc-docs +Requires: myplc-docs Provides: myplc -- 2.43.0