From 2394c98c05d5d6ca61f253be0ce6b918b3fa0a4a Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Thu, 29 Jul 1999 22:14:09 +0000
Subject: [PATCH] Minor updates.

---
 Doc/tools/sgmlconv/make.rules | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Doc/tools/sgmlconv/make.rules b/Doc/tools/sgmlconv/make.rules
index 491784ed129..24f8ffe1e4f 100644
--- 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: