use dot_builtin so that tests work in build tree without install

diff --git a/graphs/directed/Makefile.am b/graphs/directed/Makefile.am
index b87b583cbf5f6707719d8c4829508a53cc582384..42266a781e417e5e145299632e25f19d44549b85 100644 (file)
--- a/graphs/directed/Makefile.am
+++ b/graphs/directed/Makefile.am
@@ -20,8 +20,10 @@ EXTRA_DIST = $(GRAPHS)
 
 CLEANFILES = core *.gv.* *.png .xvpics/* 
 
+DOT = $(top_builddir)/cmd/dot/dot_builtins
+
 test:
-       $(top_builddir)/cmd/dot/dot \
+       $(DOT) \
                -Tcanon -Tgv -Tplain -Tplain-ext -Txdot \
                -Tcmap -Tcmapx -Tismap -Timap \
                -Tjpg -Tpdf -Tfig -Tgif \
@@ -39,167 +41,133 @@ ins_test:
                 -Tsvg -Tsvg:cairo -Tsvgz -Tvrml \
                 -O $(GRAPHS) 
 
-#      for i in $(GRAPHS); do \
-#              echo "dot $$i"; \
-#              $(top_builddir)/cmd/dot/dot \
-#                      -Tcanon -o$$i.canon \
-#                      -Tcmap -o$$i.cmap \
-#                      -Tcmapx -o$$i.cmapx \
-#                      -Tdia -o$$i.dia \
-#                      -Tgv -o$$i.gv \
-#                      -Tfig -o$$i.fig \
-#                      -Tgd -o$$i.gd \
-#                      -Tgd2 -o$$i.gd2 \
-#                      -Tgif -o$$i.gif \
-#                      -Thpgl -o$$i.hpgl \
-#                      -Tismap -o$$i.ismap \
-#                      -Timap -o$$i.imap \
-#                      -Tjpg -o$$i.jpg \
-#                      -Tmif -o$$i.mif \
-#                      -Tmp -o$$i.mp \
-#                      -Tpcl -o$$i.pcl \
-#                      -Tpic -o$$i.pic \
-#                      -Tplain -o$$i.plain \
-#                      -Tplain-ext -o$$i.plain-ext \
-#                      -Tpng -o$$i.png \
-#                      -Tps -o$$i.ps \
-#                      -Tps2 -o$$i.ps2 \
-#                      -Tsvg -o$$i.svg \
-#                      -Tsvgz -o$$i.svgz \
-#                      -Twbmp -o$$i.wbmp \
-#                      -Tvrml -o$$i.vrml \
-#                      -Tvtx -o$$i.vtx \
-#                      -Txdot -o$$i.xdot \
-#                              $(top_srcdir)/graphs/directed/$$i; \
-#      done
-
 canon:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tcanon -o$$i.canon $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tcanon -o$$i.canon $(top_srcdir)/graphs/directed/$$i; done
 
 cmap:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tcmap -o$$i.cmap $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tcmap -o$$i.cmap $(top_srcdir)/graphs/directed/$$i; done
 cmapx:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tcmapx -o$$i.cmapx $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tcmapx -o$$i.cmapx $(top_srcdir)/graphs/directed/$$i; done
 
 dia:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tdia -o$$i.dia $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tdia -o$$i.dia $(top_srcdir)/graphs/directed/$$i; done
 
 fig:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tfig -o$$i.fig $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tfig -o$$i.fig $(top_srcdir)/graphs/directed/$$i; done
 
 gd:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tgd -o$$i.gd $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tgd -o$$i.gd $(top_srcdir)/graphs/directed/$$i; done
 
 gd2:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tgd2 -o$$i.gd2 $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tgd2 -o$$i.gd2 $(top_srcdir)/graphs/directed/$$i; done
 
 gif:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tgif -o$$i.gif $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tgif -o$$i.gif $(top_srcdir)/graphs/directed/$$i; done
 
 gv dot:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tgv -o$$i.gv $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tgv -o$$i.gv $(top_srcdir)/graphs/directed/$$i; done
 
 hpgl:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Thpgl -o$$i.hpgl $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Thpgl -o$$i.hpgl $(top_srcdir)/graphs/directed/$$i; done
 
 ismap:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tismap -o$$i.ismap $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tismap -o$$i.ismap $(top_srcdir)/graphs/directed/$$i; done
 
 imap:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Timap -o$$i.imap $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Timap -o$$i.imap $(top_srcdir)/graphs/directed/$$i; done
 
 jpg:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tjpg -o$$i.jpg $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tjpg -o$$i.jpg $(top_srcdir)/graphs/directed/$$i; done
 
 mif:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tmif -o$$i.mif $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tmif -o$$i.mif $(top_srcdir)/graphs/directed/$$i; done
 
 mp:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tmp -o$$i.mp $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tmp -o$$i.mp $(top_srcdir)/graphs/directed/$$i; done
 
 pcl:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tpcl -o$$i.pcl $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tpcl -o$$i.pcl $(top_srcdir)/graphs/directed/$$i; done
 
 pic:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tpic -o$$i.pic $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tpic -o$$i.pic $(top_srcdir)/graphs/directed/$$i; done
 
 plain:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tplain -o$$i.plain $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tplain -o$$i.plain $(top_srcdir)/graphs/directed/$$i; done
 
 plain-ext:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tplain-ext -o$$i.plain-ext $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tplain-ext -o$$i.plain-ext $(top_srcdir)/graphs/directed/$$i; done
 
 pdf:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tpdf -o$$i.pdf $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tpdf -o$$i.pdf $(top_srcdir)/graphs/directed/$$i; done
 
 png:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tpng -o$$i.png $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tpng -o$$i.png $(top_srcdir)/graphs/directed/$$i; done
 
 png_cg:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tpng:cg -o$$i.cg.png $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tpng:cg -o$$i.cg.png $(top_srcdir)/graphs/directed/$$i; done
 
 ps:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tps -o$$i.ps $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tps -o$$i.ps $(top_srcdir)/graphs/directed/$$i; done
 
 ps_gd:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tps:gd -o$$i.gd.ps $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tps:gd -o$$i.gd.ps $(top_srcdir)/graphs/directed/$$i; done
 
 ps_cairo:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tps:cairo -o$$i.cairo.ps $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tps:cairo -o$$i.cairo.ps $(top_srcdir)/graphs/directed/$$i; done
 
 ps_lasi:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tps:lasi -o$$i.lasi.ps $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tps:lasi -o$$i.lasi.ps $(top_srcdir)/graphs/directed/$$i; done
 
 ps2:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tps2 -o$$i.ps2 $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tps2 -o$$i.ps2 $(top_srcdir)/graphs/directed/$$i; done
 
 svg:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tsvg -o$$i.svg $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tsvg -o$$i.svg $(top_srcdir)/graphs/directed/$$i; done
 
 svgz:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tsvgz -o$$i.svgz $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tsvgz -o$$i.svgz $(top_srcdir)/graphs/directed/$$i; done
 
 wbmp:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Twbmp -o$$i.wbmp $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Twbmp -o$$i.wbmp $(top_srcdir)/graphs/directed/$$i; done
 
 vrml:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tvrml -o$$i.vrml $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tvrml -o$$i.vrml $(top_srcdir)/graphs/directed/$$i; done
 
 vtx:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Tvtx -o$$i.vtx $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Tvtx -o$$i.vtx $(top_srcdir)/graphs/directed/$$i; done
 
 xdot:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/cmd/dot/dot -Txdot -o$$i.xdot $(top_srcdir)/graphs/directed/$$i; done
+               $(DOT) -Txdot -o$$i.xdot $(top_srcdir)/graphs/directed/$$i; done

diff --git a/graphs/undirected/Makefile.am b/graphs/undirected/Makefile.am
index e1845c49887086721a6b84769dd426648b25d0f8..e05796bbf11748a937cf90698f1068e15f974117 100644 (file)
--- a/graphs/undirected/Makefile.am
+++ b/graphs/undirected/Makefile.am
@@ -11,8 +11,10 @@ EXTRA_DIST = $(GRAPHS)
 
 CLEANFILES = core *.gv.* *.png .xvpics/* 
 
+DOT = $(top_builddir)/cmd/dot/dot_builtins
+
 test:
-       $(top_builddir)/cmd/dot/dot -Kneato \
+       $(DOT) -Kneato \
                -Tcanon -Tgv -Tplain -Tplain-ext -Txdot \
                -Tcmap -Tcmapx -Tismap -Timap \
                -Tjpg -Tpdf -Tfig -Tgif -Tpng \
@@ -20,156 +22,122 @@ test:
                -Tsvg -Tsvg:cairo -Tsvgz -Tvrml \
                -O $(GRAPHS) 
 
-#      for i in $(GRAPHS); do \
-#              echo "neato $$i"; \
-#              $(top_builddir)/cmd/dot/dot -Kneato \
-#                      -Tcanon -o$$i.canon \
-#                      -Tcmap -o$$i.cmap \
-#                      -Tcmapx -o$$i.cmapx \
-#                      -Tdia -o$$i.dia \
-#                      -Tgv -o$$i.gv \
-#                      -Tfig -o$$i.fig \
-#                      -Tgd -o$$i.gd \
-#                      -Tgd2 -o$$i.gd2 \
-#                      -Tgif -o$$i.gif \
-#                      -Thpgl -o$$i.hpgl \
-#                      -Tismap -o$$i.ismap \
-#                      -Timap -o$$i.imap \
-#                      -Tjpg -o$$i.jpg \
-#                      -Tmif -o$$i.mif \
-#                      -Tmp -o$$i.mp \
-#                      -Tpcl -o$$i.pcl \
-#                      -Tpic -o$$i.pic \
-#                      -Tplain -o$$i.plain \
-#                      -Tplain-ext -o$$i.plain-ext \
-#                      -Tpng -o$$i.png \
-#                      -Tps -o$$i.ps \
-#                      -Tps2 -o$$i.ps2 \
-#                      -Tsvg -o$$i.svg \
-#                      -Tsvgz -o$$i.svgz \
-#                      -Twbmp -o$$i.wbmp \
-#                      -Tvrml -o$$i.vrml \
-#                      -Tvtx -o$$i.vtx \
-#                      -Txdot -o$$i.xdot \
-#                              $(top_srcdir)/graphs/undirected/$$i; \
-#      done
-
 canon:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Tcanon -o$$i.canon $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Tcanon -o$$i.canon $(top_srcdir)/graphs/undirected/$$i; done
 
 cmap:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Tcmap -o$$i.cmap $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Tcmap -o$$i.cmap $(top_srcdir)/graphs/undirected/$$i; done
 
 cmapx:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Tcmapx -o$$i.cmapx $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Tcmapx -o$$i.cmapx $(top_srcdir)/graphs/undirected/$$i; done
 
 dia:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Tdia -o$$i.dia $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Tdia -o$$i.dia $(top_srcdir)/graphs/undirected/$$i; done
 
 fig:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Tfig -o$$i.fig $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Tfig -o$$i.fig $(top_srcdir)/graphs/undirected/$$i; done
 
 gd:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Tgd -o$$i.gd $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Tgd -o$$i.gd $(top_srcdir)/graphs/undirected/$$i; done
 
 gd2:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Tgd2 -o$$i.gd2 $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Tgd2 -o$$i.gd2 $(top_srcdir)/graphs/undirected/$$i; done
 
 gif:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Tgif -o$$i.gif $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Tgif -o$$i.gif $(top_srcdir)/graphs/undirected/$$i; done
 
 gv dot:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Tgv -o$$i.gv $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Tgv -o$$i.gv $(top_srcdir)/graphs/undirected/$$i; done
 
 hpgl:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Thpgl -o$$i.hpgl $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Thpgl -o$$i.hpgl $(top_srcdir)/graphs/undirected/$$i; done
 
 ismap:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Tismap -o$$i.ismap $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Tismap -o$$i.ismap $(top_srcdir)/graphs/undirected/$$i; done
 
 imap:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Timap -o$$i.imap $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Timap -o$$i.imap $(top_srcdir)/graphs/undirected/$$i; done
 
 jpg:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Tjpg -o$$i.jpg $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Tjpg -o$$i.jpg $(top_srcdir)/graphs/undirected/$$i; done
 
 mif:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Tmif -o$$i.mif $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Tmif -o$$i.mif $(top_srcdir)/graphs/undirected/$$i; done
 
 mp:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Tmp -o$$i.mp $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Tmp -o$$i.mp $(top_srcdir)/graphs/undirected/$$i; done
 
 pcl:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Tpcl -o$$i.pcl $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Tpcl -o$$i.pcl $(top_srcdir)/graphs/undirected/$$i; done
 
 pic:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Tpic -o$$i.pic $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Tpic -o$$i.pic $(top_srcdir)/graphs/undirected/$$i; done
 
 plain:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Tplain -o$$i.plain $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Tplain -o$$i.plain $(top_srcdir)/graphs/undirected/$$i; done
 
 plain-ext:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Tplain-ext -o$$i.plain-ext $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Tplain-ext -o$$i.plain-ext $(top_srcdir)/graphs/undirected/$$i; done
 
 png:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Tpng -o$$i.png $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Tpng -o$$i.png $(top_srcdir)/graphs/undirected/$$i; done
 
 ps:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Tps -o$$i.ps $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Tps -o$$i.ps $(top_srcdir)/graphs/undirected/$$i; done
 
 ps_cairo:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Tps:cairo -o$$i.cairo.ps $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Tps:cairo -o$$i.cairo.ps $(top_srcdir)/graphs/undirected/$$i; done
 
 ps_lasi:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Tps:lasi -o$$i.lasi.ps $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Tps:lasi -o$$i.lasi.ps $(top_srcdir)/graphs/undirected/$$i; done
 
 ps2:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Tps2 -o$$i.ps2 $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Tps2 -o$$i.ps2 $(top_srcdir)/graphs/undirected/$$i; done
 
 svg:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Tsvg -o$$i.svg $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Tsvg -o$$i.svg $(top_srcdir)/graphs/undirected/$$i; done
 
 svgz:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Tsvgz -o$$i.svgz $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Tsvgz -o$$i.svgz $(top_srcdir)/graphs/undirected/$$i; done
 
 wbmp:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Twbmp -o$$i.wbmp $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Twbmp -o$$i.wbmp $(top_srcdir)/graphs/undirected/$$i; done
 
 vrml:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Tvrml -o$$i.vrml $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Tvrml -o$$i.vrml $(top_srcdir)/graphs/undirected/$$i; done
 
 vtx:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Tvtx -o$$i.vtx $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Tvtx -o$$i.vtx $(top_srcdir)/graphs/undirected/$$i; done
 
 xdot:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/cmd/dot/dot -Kneato -Txdot -o$$i.xdot $(top_srcdir)/graphs/undirected/$$i; done
+               $(DOT) -Kneato -Txdot -o$$i.xdot $(top_srcdir)/graphs/undirected/$$i; done