Use variable substitution in doc and refdoc targets

diff --git a/docbook/simple/Makefile b/docbook/simple/Makefile
index a0748ef751bb9a9d1ec09b601bff4bc0a52fd562..637dd5f40832cd7e83865d8ac69fd44027643d58 100644 (file)
--- a/docbook/simple/Makefile
+++ b/docbook/simple/Makefile
@@ -1,6 +1,7 @@
 include ../../cvstools/Makefile.incl
 
 MODULES=sdbcent.mod sdbhier.mod sdbpool.mod sinclist.mod
+VERSION=1.1CR1
 
 all: sdocbook.dtd sdocbookref.dtd
 
@@ -22,13 +23,13 @@ doc: sdocbook.dtd
        dtdparse --title "Simplified DocBook DTD" \
                  --output sdocbook.xml \
                  --decl /usr/lib/sgml/declaration/xml.dcl \
-                 --public "-//OASIS//DTD Simplified DocBook XML V1.0//EN" \
-                 --system "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook.dtd" \
+                 --public "-//OASIS//DTD Simplified DocBook XML V$(VERSION)//EN" \
+                 --system "http://docbook.org/xml/simple/$(VERSION)/sdocbook.dtd" \
                  --nounexpanded sdocbook.dtd
        dtdformat --html --noentities --nonotations sdocbook.xml
 
 refdoc: sdocbookref.dtd
-       dtdparse --title "Simplified DocBook RefEntry DTD" --output sdocbookref.xml --decl /usr/lib/sgml/declaration/xml.dcl --public "-//OASIS//DTD Simplified DocBook RefEntry XML V1.0//EN" --system "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbookref.dtd" --nounexpanded sdocbookref.dtd
+       dtdparse --title "Simplified DocBook RefEntry DTD" --output sdocbookref.xml --decl /usr/lib/sgml/declaration/xml.dcl --public "-//OASIS//DTD Simplified DocBook RefEntry XML V$(VERSION)//EN" --system "http://docbook.org/xml/simple/$(VERSION)/sdocbookref.dtd" --nounexpanded sdocbookref.dtd
        dtdformat --html --noentities --nonotations sdocbookref.xml
 
 clean: