diff --git a/Doc/tools/sgmlconv/Makefile b/Doc/tools/sgmlconv/Makefile
index 30a846e..d222933 100644
--- a/Doc/tools/sgmlconv/Makefile
+++ b/Doc/tools/sgmlconv/Makefile
@@ -10,8 +10,8 @@
 TOOLSDIR=tools
 
 SGMLRULES=../$(TOOLSDIR)/sgmlconv/make.rules
-# The 'inst' directory breaks the conversion, so skip it for now.
-SUBDIRS=api dist ext lib mac ref tut
+# The 'inst' and 'tut' directories break the conversion, so skip them for now.
+SUBDIRS=api dist ext lib mac ref
 SUBMAKE=$(MAKE) -f $(SGMLRULES) TOOLSDIR=../$(TOOLSDIR)
 
 all:	xml
@@ -21,47 +21,47 @@
 
 xml:
 	for DIR in $(SUBDIRS) ; do \
-	    (cd $$DIR; $(SUBMAKE) xml) || exit $$? ; done
+	    (cd $$DIR && $(SUBMAKE) xml) || exit $$? ; done
 
 esis:
 	for DIR in $(SUBDIRS) ; do \
-	    (cd $$DIR; $(SUBMAKE) esis) || exit $$? ; done
+	    (cd $$DIR && $(SUBMAKE) esis) || exit $$? ; done
 
 esis1:
 	for DIR in $(SUBDIRS) ; do \
-	    (cd $$DIR; $(SUBMAKE) esis1) || exit $$? ; done
+	    (cd $$DIR && $(SUBMAKE) esis1) || exit $$? ; done
 
 tarball:  xml
 	tar cf - tools/sgmlconv */*.xml | gzip -9 >xml-1.5.2b2.tgz
 
 api:
-	cd api; $(SUBMAKE)
+	cd api && $(SUBMAKE)
 
 dist:
-	cd dist; $(SUBMAKE)
+	cd dist && $(SUBMAKE)
 
 ext:
-	cd ext; $(SUBMAKE)
+	cd ext && $(SUBMAKE)
 
 inst:
-	cd inst; $(SUBMAKE)
+	cd inst && $(SUBMAKE)
 
 lib:
-	cd lib; $(SUBMAKE)
+	cd lib && $(SUBMAKE)
 
 mac:
-	cd mac; $(SUBMAKE)
+	cd mac && $(SUBMAKE)
 
 ref:
-	cd ref; $(SUBMAKE)
+	cd ref && $(SUBMAKE)
 
 tut:
-	cd tut; $(SUBMAKE)
+	cd tut && $(SUBMAKE)
 
 clean:
 	for DIR in $(SUBDIRS) ; do \
-	    (cd $$DIR; $(SUBMAKE) clean) ; done
+	    (cd $$DIR && $(SUBMAKE) clean) || exit $$? ; done
 
 clobber:
 	for DIR in $(SUBDIRS) ; do \
-	    (cd $$DIR; $(SUBMAKE) clobber) ; done
+	    (cd $$DIR && $(SUBMAKE) clobber) || exit $$? ; done