Minor updates.

diff --git a/Doc/tools/sgmlconv/make.rules b/Doc/tools/sgmlconv/make.rules
index 491784ed129e0cd3cd9927a2a56602a6a1fa9ba9..24f8ffe1e4feb28b50bc67afaa2f06161de35b2c 100644 (file)
--- a/Doc/tools/sgmlconv/make.rules
+++ b/Doc/tools/sgmlconv/make.rules
@@ -7,11 +7,13 @@ DOCFIXER=     $(TOOLSDIR)/sgmlconv/docfixer.py
 ESIS2ML=       $(TOOLSDIR)/sgmlconv/esis2sgml.py
 FIXGES=                $(TOOLSDIR)/sgmlconv/fixgenents.sh
 LATEX2ESIS=    $(TOOLSDIR)/sgmlconv/latex2esis.py
+CONVERSION=    $(TOOLSDIR)/sgmlconv/conversion.xml
 
 ESISTARGETS=   $(patsubst %.tex,%.esis,$(wildcard *.tex))
 SGMLTARGETS=   $(patsubst %.tex,%.sgml,$(wildcard *.tex))
 XMLTARGETS=    $(patsubst %.tex,%.xml,$(wildcard *.tex))
 
+L2EFLAGS=
 
 all:   xml
 
@@ -21,7 +23,9 @@ xml:  $(XMLTARGETS)
 
 ESISTOOLS=     $(TOOLSDIR)/sgmlconv/esistools.py
 
-$(ESISTARGETS): $(LATEX2ESIS) $(DOCFIXER) $(ESISTOOLS)
+$(ESISTARGETS): $(LATEX2ESIS) $(DOCFIXER) $(ESISTOOLS) $(CONVERSION)
+# This variant is easier to work with while debugging the conversion spec:
+#$(ESISTARGETS): $(LATEX2ESIS) $(DOCFIXER) $(ESISTOOLS)
 $(SGMLTARGETS): $(ESIS2ML) $(FIXGES)
 $(XMLTARGETS): $(ESIS2ML) $(FIXGES)
 
@@ -29,15 +33,15 @@ $(XMLTARGETS): $(ESIS2ML) $(FIXGES)
 .SUFFIXES: .esis .sgml .tex .xml
 
 .tex.esis:
-       $(LATEX2ESIS) $< temp.esis
+       $(LATEX2ESIS) $(L2EFLAGS) $< temp.esis
        $(DOCFIXER) temp.esis $@
        rm temp.esis
 
 .esis.sgml:
-       $(ESIS2ML) --sgml --autoclose para $< | $(FIXGES) > $@
+       $(ESIS2ML) --sgml --autoclose para $< | $(FIXGES) >$@
 
 .esis.xml:
-       $(ESIS2ML) --xml $< | $(FIXGES) > $@
+       $(ESIS2ML) --xml $< | $(FIXGES) >$@
 
 
 clean: