Update the rules to separate the two phases for the ESIS generation,
entirely so that debugging can be performed independently.
diff --git a/Doc/tools/sgmlconv/make.rules b/Doc/tools/sgmlconv/make.rules
index 84c8f31..93579c5 100644
--- a/Doc/tools/sgmlconv/make.rules
+++ b/Doc/tools/sgmlconv/make.rules
@@ -1,6 +1,6 @@
# -*- makefile -*-
#
-# Extra magic needed by the LaTeX->SGML conversion process. This requires
+# Extra magic needed by the LaTeX->XML conversion process. This requires
# $(TOOLSDIR) to be properly defined.
DOCFIXER= $(TOOLSDIR)/sgmlconv/docfixer.py
@@ -9,7 +9,7 @@
CONVERSION= $(TOOLSDIR)/sgmlconv/conversion.xml
ESISTARGETS= $(patsubst %.tex,%.esis,$(wildcard *.tex))
-SGMLTARGETS= $(patsubst %.tex,%.sgml,$(wildcard *.tex))
+ESIS1TARGETS= $(patsubst %.tex,%.esis1,$(wildcard *.tex))
XMLTARGETS= $(patsubst %.tex,%.xml,$(wildcard *.tex))
L2EFLAGS=
@@ -17,34 +17,32 @@
all: xml
esis: $(ESISTARGETS)
-sgml: $(SGMLTARGETS)
+esis1: $(ESIS1TARGETS)
xml: $(XMLTARGETS)
ESISTOOLS= $(TOOLSDIR)/sgmlconv/esistools.py
$(ESISTARGETS): $(LATEX2ESIS) $(DOCFIXER) $(ESISTOOLS) $(CONVERSION)
+$(ESIS1TARGETS): $(LATEX2ESIS) $(CONVERSION)
# This variant is easier to work with while debugging the conversion spec:
#$(ESISTARGETS): $(LATEX2ESIS) $(DOCFIXER) $(ESISTOOLS)
-$(SGMLTARGETS): $(ESIS2ML)
$(XMLTARGETS): $(ESIS2ML)
-.SUFFIXES: .esis .sgml .tex .xml
+.SUFFIXES: .esis .esis1 .tex .xml
-.tex.esis:
- $(LATEX2ESIS) $(L2EFLAGS) $< temp.esis
- $(DOCFIXER) temp.esis $@
- rm temp.esis
+.tex.esis1:
+ $(LATEX2ESIS) $(L2EFLAGS) $< $@
-.esis.sgml:
- $(ESIS2ML) --sgml --autoclose para $< $@
+.esis1.esis:
+ $(DOCFIXER) $< $@
.esis.xml:
$(ESIS2ML) --xml $< $@
clean:
- rm -f *.esis
+ rm -f *.esis *.esis1
clobber: clean
- rm -f *.sgml *.xml
+ rm -f *.xml