diff --git a/SWIG/Makefile.in b/SWIG/Makefile.in
index 8af29ef54..7e097277f 100644
--- a/SWIG/Makefile.in
+++ b/SWIG/Makefile.in
@@ -107,62 +107,63 @@ check-aliveness:
 	$(skip-ruby) || ./swig -ruby -help
 
 check-examples:
-	$(skip-tcl) || (cd Examples/tcl/class ; $(chk))
-	$(skip-tcl) || (cd Examples/tcl/constants ; $(chk))
-	$(skip-tcl) || (cd Examples/tcl/pointer ; $(chk))
-	$(skip-tcl) || (cd Examples/tcl/reference ; $(chk))
-	$(skip-tcl) || (cd Examples/tcl/simple ; $(chk))
-	$(skip-tcl) || (cd Examples/tcl/value ; $(chk))
-	$(skip-tcl) || (cd Examples/tcl/variables ; $(chk))
-	$(skip-perl) || (cd Examples/perl5/class ; $(chk))
-	$(skip-perl) || (cd Examples/perl5/constants ; $(chk))
-	$(skip-perl) || (cd Examples/perl5/pointer ; $(chk))
-	$(skip-perl) || (cd Examples/perl5/reference ; $(chk))
-	$(skip-perl) || (cd Examples/perl5/simple ; $(chk))
-	$(skip-perl) || (cd Examples/perl5/value ; $(chk))
-	$(skip-perl) || (cd Examples/perl5/variables ; $(chk))
-	$(skip-python) || (cd Examples/python/class ; $(chk))
-	$(skip-python) || (cd Examples/python/constants ; $(chk))
-	$(skip-python) || (cd Examples/python/pointer ; $(chk))
-	$(skip-python) || (cd Examples/python/reference ; $(chk))
-	$(skip-python) || (cd Examples/python/simple ; $(chk))
-	$(skip-python) || (cd Examples/python/value ; $(chk))
-	$(skip-python) || (cd Examples/python/variables ; $(chk))
-	$(skip-java) || (cd Examples/java/native ; $(chk))
-	$(skip-java) || (cd Examples/java/simple ; $(chk))
-	$(skip-java) || (cd Examples/java/typemap ; $(chk))
-	$(skip-guile) || (cd Examples/guile/matrix ; $(chk))
-	$(skip-guile) || (cd Examples/guile/simple ; $(chk))
-	$(skip-mzscheme) || (cd Examples/mzscheme/simple ; $(chk))
-	$(skip-ruby) || (cd Examples/ruby/class ; $(chk))
-	$(skip-ruby) || (cd Examples/ruby/constants ; $(chk))
-	$(skip-ruby) || (cd Examples/ruby/pointer ; $(chk))
-	$(skip-ruby) || (cd Examples/ruby/reference ; $(chk))
-	$(skip-ruby) || (cd Examples/ruby/simple ; $(chk))
-	$(skip-ruby) || (cd Examples/ruby/value ; $(chk))
-	$(skip-ruby) || (cd Examples/ruby/variables ; $(chk))
+	$(skip-tcl) || (cd Examples/tcl/class && $(chk))
+	$(skip-tcl) || (cd Examples/tcl/constants && $(chk))
+	$(skip-tcl) || (cd Examples/tcl/pointer && $(chk))
+	$(skip-tcl) || (cd Examples/tcl/reference && $(chk))
+	$(skip-tcl) || (cd Examples/tcl/simple && $(chk))
+	$(skip-tcl) || (cd Examples/tcl/value && $(chk))
+	$(skip-tcl) || (cd Examples/tcl/variables && $(chk))
+	$(skip-perl) || (cd Examples/perl5/class && $(chk))
+	$(skip-perl) || (cd Examples/perl5/constants && $(chk))
+	$(skip-perl) || (cd Examples/perl5/pointer && $(chk))
+	$(skip-perl) || (cd Examples/perl5/reference && $(chk))
+	$(skip-perl) || (cd Examples/perl5/simple && $(chk))
+	$(skip-perl) || (cd Examples/perl5/value && $(chk))
+	$(skip-perl) || (cd Examples/perl5/variables && $(chk))
+	$(skip-python) || (cd Examples/python/class && $(chk))
+	$(skip-python) || (cd Examples/python/constants && $(chk))
+	$(skip-python) || (cd Examples/python/pointer && $(chk))
+	$(skip-python) || (cd Examples/python/reference && $(chk))
+	$(skip-python) || (cd Examples/python/simple && $(chk))
+	$(skip-python) || (cd Examples/python/value && $(chk))
+	$(skip-python) || (cd Examples/python/variables && $(chk))
+	$(skip-java) || (cd Examples/java/native && $(chk))
+	$(skip-java) || (cd Examples/java/simple && $(chk))
+	$(skip-java) || (cd Examples/java/typemap && $(chk))
+	$(skip-guile) || (cd Examples/guile/matrix && $(chk))
+	$(skip-guile) || (cd Examples/guile/simple && $(chk))
+	$(skip-guile) || (cd Examples/guile/port && $(chk))
+	$(skip-mzscheme) || (cd Examples/mzscheme/simple && $(chk))
+	$(skip-ruby) || (cd Examples/ruby/class && $(chk))
+	$(skip-ruby) || (cd Examples/ruby/constants && $(chk))
+	$(skip-ruby) || (cd Examples/ruby/pointer && $(chk))
+	$(skip-ruby) || (cd Examples/ruby/reference && $(chk))
+	$(skip-ruby) || (cd Examples/ruby/simple && $(chk))
+	$(skip-ruby) || (cd Examples/ruby/value && $(chk))
+	$(skip-ruby) || (cd Examples/ruby/variables && $(chk))
 
 Examples/GIFPlot/libgifplot.a:
 	cd Examples/GIFPlot/Lib ; $(MAKE)
 
 check-gifplot-example: Examples/GIFPlot/libgifplot.a
-	$(skip-perl) || (cd Examples/GIFPlot/Perl/full ; $(chk))
-	$(skip-perl) || (cd Examples/GIFPlot/Perl/simple ; $(chk))
-	$(skip-perl) || (cd Examples/GIFPlot/Perl/shadow ; $(chk))
-	$(skip-python) || (cd Examples/GIFPlot/Python/full ; $(chk))
-	$(skip-python) || (cd Examples/GIFPlot/Python/simple ; $(chk))
-	$(skip-tcl) || (cd Examples/GIFPlot/Tcl/full ; $(chk))
-	$(skip-tcl) || (cd Examples/GIFPlot/Tcl/mandel ; $(chk))
-	$(skip-tcl) || (cd Examples/GIFPlot/Tcl/simple ; $(chk))
-	$(skip-guile) || (cd Examples/GIFPlot/Guile/full ; $(chk))
-	$(skip-guile) || (cd Examples/GIFPlot/Guile/simple ; $(chk))
-	$(skip-ruby) || (cd Examples/GIFPlot/Ruby/full ; $(chk))
-	$(skip-ruby) || (cd Examples/GIFPlot/Ruby/simple ; $(chk))
-	$(skip-ruby) || (cd Examples/GIFPlot/Ruby/shadow ; $(chk))
+	$(skip-perl) || (cd Examples/GIFPlot/Perl/full && $(chk))
+	$(skip-perl) || (cd Examples/GIFPlot/Perl/simple && $(chk))
+	$(skip-perl) || (cd Examples/GIFPlot/Perl/shadow && $(chk))
+	$(skip-python) || (cd Examples/GIFPlot/Python/full && $(chk))
+	$(skip-python) || (cd Examples/GIFPlot/Python/simple && $(chk))
+	$(skip-tcl) || (cd Examples/GIFPlot/Tcl/full && $(chk))
+	$(skip-tcl) || (cd Examples/GIFPlot/Tcl/mandel && $(chk))
+	$(skip-tcl) || (cd Examples/GIFPlot/Tcl/simple && $(chk))
+	$(skip-guile) || (cd Examples/GIFPlot/Guile/full && $(chk))
+	$(skip-guile) || (cd Examples/GIFPlot/Guile/simple && $(chk))
+	$(skip-ruby) || (cd Examples/GIFPlot/Ruby/full && $(chk))
+	$(skip-ruby) || (cd Examples/GIFPlot/Ruby/simple && $(chk))
+	$(skip-ruby) || (cd Examples/GIFPlot/Ruby/shadow && $(chk))
 
 check-c++-examples:
-	$(skip-python) || (cd Examples/C++/Python ; $(chk))
-	$(skip-java) || (cd Examples/C++/Java ; $(chk))
+	$(skip-python) || (cd Examples/C++/Python && $(chk))
+	$(skip-java) || (cd Examples/C++/Java && $(chk))
 
 check: check-aliveness check-examples check-gifplot-example check-c++-examples