diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 535ea55ae..91aab1c83 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -552,7 +552,7 @@ java_cpp: $(SRCS)
 # -----------------------------------------------------------------
 
 java_run:
-	env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(JAVA) $(RUNME) $(RUNPIPE)
+	env LD_LIBRARY_PATH=. $(RUNTOOL) $(JAVA) $(RUNME) $(RUNPIPE)
 
 # -----------------------------------------------------------------
 # Version display
diff --git a/Examples/java/callback/Makefile b/Examples/java/callback/Makefile
index 14c301703..c4d4d0e36 100644
--- a/Examples/java/callback/Makefile
+++ b/Examples/java/callback/Makefile
@@ -5,14 +5,13 @@ TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 
-all::	java
+check: build
+	$(MAKE) -f $(TOP)/Makefile java_run
 
-java::
+build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp
 	javac *.java
 
-clean::
+clean:
 	$(MAKE) -f $(TOP)/Makefile java_clean
-
-check: all
diff --git a/Examples/java/class/Makefile b/Examples/java/class/Makefile
index 14c301703..c4d4d0e36 100644
--- a/Examples/java/class/Makefile
+++ b/Examples/java/class/Makefile
@@ -5,14 +5,13 @@ TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 
-all::	java
+check: build
+	$(MAKE) -f $(TOP)/Makefile java_run
 
-java::
+build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp
 	javac *.java
 
-clean::
+clean:
 	$(MAKE) -f $(TOP)/Makefile java_clean
-
-check: all
diff --git a/Examples/java/constants/Makefile b/Examples/java/constants/Makefile
index 2b3d35c6a..0c7c16349 100644
--- a/Examples/java/constants/Makefile
+++ b/Examples/java/constants/Makefile
@@ -5,14 +5,13 @@ TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 
-all::	java
+check: build
+	$(MAKE) -f $(TOP)/Makefile java_run
 
-java::
+build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp
 	javac *.java
 
-clean::
+clean:
 	$(MAKE) -f $(TOP)/Makefile java_clean
-
-check: all
diff --git a/Examples/java/enum/Makefile b/Examples/java/enum/Makefile
index 14c301703..c4d4d0e36 100644
--- a/Examples/java/enum/Makefile
+++ b/Examples/java/enum/Makefile
@@ -5,14 +5,13 @@ TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 
-all::	java
+check: build
+	$(MAKE) -f $(TOP)/Makefile java_run
 
-java::
+build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp
 	javac *.java
 
-clean::
+clean:
 	$(MAKE) -f $(TOP)/Makefile java_clean
-
-check: all
diff --git a/Examples/java/extend/Makefile b/Examples/java/extend/Makefile
index 14c301703..c4d4d0e36 100644
--- a/Examples/java/extend/Makefile
+++ b/Examples/java/extend/Makefile
@@ -5,14 +5,13 @@ TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 
-all::	java
+check: build
+	$(MAKE) -f $(TOP)/Makefile java_run
 
-java::
+build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp
 	javac *.java
 
-clean::
+clean:
 	$(MAKE) -f $(TOP)/Makefile java_clean
-
-check: all
diff --git a/Examples/java/funcptr/Makefile b/Examples/java/funcptr/Makefile
index 968c92c6c..ce51a1c74 100644
--- a/Examples/java/funcptr/Makefile
+++ b/Examples/java/funcptr/Makefile
@@ -5,14 +5,13 @@ TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 
-all::	java
+check: build
+	$(MAKE) -f $(TOP)/Makefile java_run
 
-java::
+build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java
 	javac *.java
 
-clean::
+clean:
 	$(MAKE) -f $(TOP)/Makefile java_clean
-
-check: all
diff --git a/Examples/java/multimap/Makefile b/Examples/java/multimap/Makefile
index 968c92c6c..ce51a1c74 100644
--- a/Examples/java/multimap/Makefile
+++ b/Examples/java/multimap/Makefile
@@ -5,14 +5,13 @@ TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 
-all::	java
+check: build
+	$(MAKE) -f $(TOP)/Makefile java_run
 
-java::
+build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java
 	javac *.java
 
-clean::
+clean:
 	$(MAKE) -f $(TOP)/Makefile java_clean
-
-check: all
diff --git a/Examples/java/native/Makefile b/Examples/java/native/Makefile
index 92afbd4d0..39e8f6d7f 100644
--- a/Examples/java/native/Makefile
+++ b/Examples/java/native/Makefile
@@ -5,14 +5,13 @@ TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 
-all::	java
+check: build
+	$(MAKE) -f $(TOP)/Makefile java_run
 
-java::
+build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java
 	javac *.java
 
-clean::
+clean:
 	$(MAKE) -f $(TOP)/Makefile java_clean
-
-check: all
diff --git a/Examples/java/pointer/Makefile b/Examples/java/pointer/Makefile
index 968c92c6c..ce51a1c74 100644
--- a/Examples/java/pointer/Makefile
+++ b/Examples/java/pointer/Makefile
@@ -5,14 +5,13 @@ TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 
-all::	java
+check: build
+	$(MAKE) -f $(TOP)/Makefile java_run
 
-java::
+build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java
 	javac *.java
 
-clean::
+clean:
 	$(MAKE) -f $(TOP)/Makefile java_clean
-
-check: all
diff --git a/Examples/java/reference/Makefile b/Examples/java/reference/Makefile
index 14c301703..c4d4d0e36 100644
--- a/Examples/java/reference/Makefile
+++ b/Examples/java/reference/Makefile
@@ -5,14 +5,13 @@ TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 
-all::	java
+check: build
+	$(MAKE) -f $(TOP)/Makefile java_run
 
-java::
+build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp
 	javac *.java
 
-clean::
+clean:
 	$(MAKE) -f $(TOP)/Makefile java_clean
-
-check: all
diff --git a/Examples/java/simple/Makefile b/Examples/java/simple/Makefile
index 968c92c6c..ce51a1c74 100644
--- a/Examples/java/simple/Makefile
+++ b/Examples/java/simple/Makefile
@@ -5,14 +5,13 @@ TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 
-all::	java
+check: build
+	$(MAKE) -f $(TOP)/Makefile java_run
 
-java::
+build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java
 	javac *.java
 
-clean::
+clean:
 	$(MAKE) -f $(TOP)/Makefile java_clean
-
-check: all
diff --git a/Examples/java/template/Makefile b/Examples/java/template/Makefile
index 2b3d35c6a..0c7c16349 100644
--- a/Examples/java/template/Makefile
+++ b/Examples/java/template/Makefile
@@ -5,14 +5,13 @@ TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 
-all::	java
+check: build
+	$(MAKE) -f $(TOP)/Makefile java_run
 
-java::
+build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp
 	javac *.java
 
-clean::
+clean:
 	$(MAKE) -f $(TOP)/Makefile java_clean
-
-check: all
diff --git a/Examples/java/typemap/Makefile b/Examples/java/typemap/Makefile
index 92afbd4d0..39e8f6d7f 100644
--- a/Examples/java/typemap/Makefile
+++ b/Examples/java/typemap/Makefile
@@ -5,14 +5,13 @@ TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 
-all::	java
+check: build
+	$(MAKE) -f $(TOP)/Makefile java_run
 
-java::
+build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java
 	javac *.java
 
-clean::
+clean:
 	$(MAKE) -f $(TOP)/Makefile java_clean
-
-check: all
diff --git a/Examples/java/variables/Makefile b/Examples/java/variables/Makefile
index 968c92c6c..ce51a1c74 100644
--- a/Examples/java/variables/Makefile
+++ b/Examples/java/variables/Makefile
@@ -5,14 +5,13 @@ TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 
-all::	java
+check: build
+	$(MAKE) -f $(TOP)/Makefile java_run
 
-java::
+build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java
 	javac *.java
 
-clean::
+clean:
 	$(MAKE) -f $(TOP)/Makefile java_clean
-
-check: all