--- a/doc/tutorial/Makefile	Thu Apr 03 23:04:25 2008 -0700
+++ b/doc/tutorial/Makefile	Thu Apr 03 23:15:16 2008 -0700
@@ -13,10 +13,9 @@
 all:  images html split-html pdf
 
 images:
-	cd figures/; cp $(TGIF_SOURCES) ../
-	$(TGIF) -print -eps $(TGIF_SOURCES) 
-	$(foreach FILE,$(TGIF_EPS),$(CONVERT) $(FILE) ${FILE:.eps=.png};)
-	$(foreach FILE,$(TGIF_EPS),$(EPSTOPDF) $(FILE);)
+	cd figures/; $(TGIF) -print -eps $(TGIF_SOURCES) 
+	cd figures/; $(foreach FILE,$(TGIF_EPS),$(CONVERT) $(FILE) ${FILE:.eps=.png};)
+	cd figures/; $(foreach FILE,$(TGIF_EPS),$(EPSTOPDF) $(FILE);)
 
 html: images
 	$(TEXI2HTML) ${CSS} tutorial.texi
@@ -28,4 +27,4 @@
 	$(TEXI2PDF) tutorial.texi
 
 clean:
-	rm -rf $(TGIF_SOURCES) $(TGIF_EPS) $(TGIF_PNG) tutorial.aux tutorial.cp tutorial.cps tutorial.fn tutorial.ky tutorial.pg tutorial.tp tutorial.vr tutorial.toc tutorial.log tutorial.pdf tutorial.html tutorial/ 
+	rm -rf tutorial.aux tutorial.cp tutorial.cps tutorial.fn tutorial.ky tutorial.pg tutorial.tp tutorial.vr tutorial.toc tutorial.log tutorial.pdf tutorial.html tutorial/ 

--- a/doc/tutorial/helpers.texi	Thu Apr 03 23:04:25 2008 -0700
+++ b/doc/tutorial/helpers.texi	Thu Apr 03 23:15:16 2008 -0700
@@ -6,7 +6,7 @@
 @code{src/helper/} directory; it depends on (and wraps) the low-level
 API which is implemented everywhere else in @code{src/}.  The following
 figure shows this relationship.
-@center @image{helpers,,,,png}
+@center @image{figures/helpers,,,,png}
 
 The use of the helper API is optional.  It has two main goals:
 @itemize @bullet