diff --git a/Examples/javascript/class/Makefile b/Examples/javascript/class/Makefile
index 1ac61ec6b..180e99cae 100755
--- a/Examples/javascript/class/Makefile
+++ b/Examples/javascript/class/Makefile
@@ -1,12 +1,9 @@
 TOP = ../..
 SWIG = $(TOP)/../preinst-swig
-JAVASCRIPT_EXE = $(TOP)/../Tools/javascript/javascript
 CXXSRCS    = example.cpp
-JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JS_SCRIPT = runme.js
 TARGET = example
 INTERFACE = example.i
-SWIGOPT = -I$(TOP)/../Lib/javascript -I$(TOP)/../Lib/javascript/jsc
 
 all::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
@@ -15,9 +12,10 @@ all::
 clean::
 	$(MAKE) -f $(TOP)/Makefile javascript_clean
 
+javascript_exe::
+	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
+		TOP='$(TOP)' javascript_exe
+
 check:: all
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' javascript_exe
-	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
-
+		TOP='$(TOP)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
diff --git a/Examples/javascript/constant/Makefile b/Examples/javascript/constant/Makefile
index bebb1f302..dbf2f6660 100755
--- a/Examples/javascript/constant/Makefile
+++ b/Examples/javascript/constant/Makefile
@@ -1,12 +1,9 @@
 TOP = ../..
 SWIG = $(TOP)/../preinst-swig
-JAVASCRIPT_EXE = $(TOP)/../Tools/javascript/javascript
 CXXSRCS    =
-JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JS_SCRIPT = runme.js
 TARGET = example
 INTERFACE = example.i
-SWIGOPT = -I$(TOP)/../Lib/javascript -I$(TOP)/../Lib/javascript/jsc
 
 all::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
@@ -15,9 +12,10 @@ all::
 clean::
 	$(MAKE) -f $(TOP)/Makefile javascript_clean
 
+javascript_exe::
+	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
+		TOP='$(TOP)' javascript_exe
+
 check:: all
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' javascript_exe
-	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
-
+		TOP='$(TOP)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
diff --git a/Examples/javascript/enum/Makefile b/Examples/javascript/enum/Makefile
index 1ac61ec6b..180e99cae 100755
--- a/Examples/javascript/enum/Makefile
+++ b/Examples/javascript/enum/Makefile
@@ -1,12 +1,9 @@
 TOP = ../..
 SWIG = $(TOP)/../preinst-swig
-JAVASCRIPT_EXE = $(TOP)/../Tools/javascript/javascript
 CXXSRCS    = example.cpp
-JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JS_SCRIPT = runme.js
 TARGET = example
 INTERFACE = example.i
-SWIGOPT = -I$(TOP)/../Lib/javascript -I$(TOP)/../Lib/javascript/jsc
 
 all::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
@@ -15,9 +12,10 @@ all::
 clean::
 	$(MAKE) -f $(TOP)/Makefile javascript_clean
 
+javascript_exe::
+	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
+		TOP='$(TOP)' javascript_exe
+
 check:: all
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' javascript_exe
-	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
-
+		TOP='$(TOP)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
diff --git a/Examples/javascript/exception/Makefile b/Examples/javascript/exception/Makefile
index 1ac61ec6b..180e99cae 100755
--- a/Examples/javascript/exception/Makefile
+++ b/Examples/javascript/exception/Makefile
@@ -1,12 +1,9 @@
 TOP = ../..
 SWIG = $(TOP)/../preinst-swig
-JAVASCRIPT_EXE = $(TOP)/../Tools/javascript/javascript
 CXXSRCS    = example.cpp
-JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JS_SCRIPT = runme.js
 TARGET = example
 INTERFACE = example.i
-SWIGOPT = -I$(TOP)/../Lib/javascript -I$(TOP)/../Lib/javascript/jsc
 
 all::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
@@ -15,9 +12,10 @@ all::
 clean::
 	$(MAKE) -f $(TOP)/Makefile javascript_clean
 
+javascript_exe::
+	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
+		TOP='$(TOP)' javascript_exe
+
 check:: all
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' javascript_exe
-	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
-
+		TOP='$(TOP)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
diff --git a/Examples/javascript/exception/runme.js b/Examples/javascript/exception/runme.js
index dfa561993..936b37883 100644
--- a/Examples/javascript/exception/runme.js
+++ b/Examples/javascript/exception/runme.js
@@ -1,6 +1,7 @@
 //file: runme.js
 // Throw a lot of exceptions
 
+print("Trying to catch some exceptions.");
 t = new example.Test();
 try{
   t.unknown();
@@ -9,6 +10,8 @@ try{
 {
   if(error == -1) {
     print("t.unknown() didn't throw");
+  } else {
+    print("successfully catched throw in Test::unknown().");
   }
 }
 
@@ -19,6 +22,8 @@ try{
 catch(error){
   if(error == -1) {
     print("t.simple() did not throw");
+  } else {
+    print("successfully catched throw in Test::simple().");
   }
 }
 
@@ -28,6 +33,8 @@ try{
 } catch(error){
   if(error == -1) {
     print("t.message() did not throw");
+  } else {
+    print("successfully catched throw in Test::message().");
   }
 }
     
@@ -38,6 +45,8 @@ try{
 catch(error){ 
   if(error == -1) {
     print("t.hosed() did not throw");
+  } else {
+    print("successfully catched throw in Test::hosed().");
   }
 }
 
@@ -48,7 +57,9 @@ for (var i=1; i<4; i++) {
   }
   catch(error){
     if(error == -1) {
-      print("t.mulit(" + i + ") did not throw");
+      print("t.multi(" + i + ") did not throw");
+    } else {
+      print("successfully catched throw in Test::multi().");
     }
   }
-}      
+}    
diff --git a/Examples/javascript/functor/Makefile b/Examples/javascript/functor/Makefile
index 1ac61ec6b..180e99cae 100755
--- a/Examples/javascript/functor/Makefile
+++ b/Examples/javascript/functor/Makefile
@@ -1,12 +1,9 @@
 TOP = ../..
 SWIG = $(TOP)/../preinst-swig
-JAVASCRIPT_EXE = $(TOP)/../Tools/javascript/javascript
 CXXSRCS    = example.cpp
-JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JS_SCRIPT = runme.js
 TARGET = example
 INTERFACE = example.i
-SWIGOPT = -I$(TOP)/../Lib/javascript -I$(TOP)/../Lib/javascript/jsc
 
 all::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
@@ -15,9 +12,10 @@ all::
 clean::
 	$(MAKE) -f $(TOP)/Makefile javascript_clean
 
+javascript_exe::
+	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
+		TOP='$(TOP)' javascript_exe
+
 check:: all
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' javascript_exe
-	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
-
+		TOP='$(TOP)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
diff --git a/Examples/javascript/namespace/Makefile b/Examples/javascript/namespace/Makefile
index 1ac61ec6b..180e99cae 100755
--- a/Examples/javascript/namespace/Makefile
+++ b/Examples/javascript/namespace/Makefile
@@ -1,12 +1,9 @@
 TOP = ../..
 SWIG = $(TOP)/../preinst-swig
-JAVASCRIPT_EXE = $(TOP)/../Tools/javascript/javascript
 CXXSRCS    = example.cpp
-JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JS_SCRIPT = runme.js
 TARGET = example
 INTERFACE = example.i
-SWIGOPT = -I$(TOP)/../Lib/javascript -I$(TOP)/../Lib/javascript/jsc
 
 all::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
@@ -15,9 +12,10 @@ all::
 clean::
 	$(MAKE) -f $(TOP)/Makefile javascript_clean
 
+javascript_exe::
+	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
+		TOP='$(TOP)' javascript_exe
+
 check:: all
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' javascript_exe
-	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
-
+		TOP='$(TOP)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
diff --git a/Examples/javascript/operator/Makefile b/Examples/javascript/operator/Makefile
index 1ac61ec6b..180e99cae 100755
--- a/Examples/javascript/operator/Makefile
+++ b/Examples/javascript/operator/Makefile
@@ -1,12 +1,9 @@
 TOP = ../..
 SWIG = $(TOP)/../preinst-swig
-JAVASCRIPT_EXE = $(TOP)/../Tools/javascript/javascript
 CXXSRCS    = example.cpp
-JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JS_SCRIPT = runme.js
 TARGET = example
 INTERFACE = example.i
-SWIGOPT = -I$(TOP)/../Lib/javascript -I$(TOP)/../Lib/javascript/jsc
 
 all::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
@@ -15,9 +12,10 @@ all::
 clean::
 	$(MAKE) -f $(TOP)/Makefile javascript_clean
 
+javascript_exe::
+	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
+		TOP='$(TOP)' javascript_exe
+
 check:: all
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' javascript_exe
-	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
-
+		TOP='$(TOP)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
diff --git a/Examples/javascript/overload/Makefile b/Examples/javascript/overload/Makefile
index 1ac61ec6b..180e99cae 100755
--- a/Examples/javascript/overload/Makefile
+++ b/Examples/javascript/overload/Makefile
@@ -1,12 +1,9 @@
 TOP = ../..
 SWIG = $(TOP)/../preinst-swig
-JAVASCRIPT_EXE = $(TOP)/../Tools/javascript/javascript
 CXXSRCS    = example.cpp
-JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JS_SCRIPT = runme.js
 TARGET = example
 INTERFACE = example.i
-SWIGOPT = -I$(TOP)/../Lib/javascript -I$(TOP)/../Lib/javascript/jsc
 
 all::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
@@ -15,9 +12,10 @@ all::
 clean::
 	$(MAKE) -f $(TOP)/Makefile javascript_clean
 
+javascript_exe::
+	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
+		TOP='$(TOP)' javascript_exe
+
 check:: all
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' javascript_exe
-	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
-
+		TOP='$(TOP)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
diff --git a/Examples/javascript/pointer/Makefile b/Examples/javascript/pointer/Makefile
index 1ac61ec6b..180e99cae 100755
--- a/Examples/javascript/pointer/Makefile
+++ b/Examples/javascript/pointer/Makefile
@@ -1,12 +1,9 @@
 TOP = ../..
 SWIG = $(TOP)/../preinst-swig
-JAVASCRIPT_EXE = $(TOP)/../Tools/javascript/javascript
 CXXSRCS    = example.cpp
-JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JS_SCRIPT = runme.js
 TARGET = example
 INTERFACE = example.i
-SWIGOPT = -I$(TOP)/../Lib/javascript -I$(TOP)/../Lib/javascript/jsc
 
 all::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
@@ -15,9 +12,10 @@ all::
 clean::
 	$(MAKE) -f $(TOP)/Makefile javascript_clean
 
+javascript_exe::
+	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
+		TOP='$(TOP)' javascript_exe
+
 check:: all
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' javascript_exe
-	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
-
+		TOP='$(TOP)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
diff --git a/Examples/javascript/reference/Makefile b/Examples/javascript/reference/Makefile
index 1ac61ec6b..180e99cae 100755
--- a/Examples/javascript/reference/Makefile
+++ b/Examples/javascript/reference/Makefile
@@ -1,12 +1,9 @@
 TOP = ../..
 SWIG = $(TOP)/../preinst-swig
-JAVASCRIPT_EXE = $(TOP)/../Tools/javascript/javascript
 CXXSRCS    = example.cpp
-JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JS_SCRIPT = runme.js
 TARGET = example
 INTERFACE = example.i
-SWIGOPT = -I$(TOP)/../Lib/javascript -I$(TOP)/../Lib/javascript/jsc
 
 all::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
@@ -15,9 +12,10 @@ all::
 clean::
 	$(MAKE) -f $(TOP)/Makefile javascript_clean
 
+javascript_exe::
+	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
+		TOP='$(TOP)' javascript_exe
+
 check:: all
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' javascript_exe
-	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
-
+		TOP='$(TOP)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
diff --git a/Examples/javascript/simple/Makefile b/Examples/javascript/simple/Makefile
index 4fbfa2802..fb4669329 100755
--- a/Examples/javascript/simple/Makefile
+++ b/Examples/javascript/simple/Makefile
@@ -1,12 +1,9 @@
 TOP = ../..
 SWIG = $(TOP)/../preinst-swig
-JAVASCRIPT_EXE = $(TOP)/../Tools/javascript/javascript
 SRCS    = example.c
-JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JS_SCRIPT = runme.js
 TARGET = example
 INTERFACE = example.i
-SWIGOPT = -I$(TOP)/../Lib/javascript -I$(TOP)/../Lib/javascript/jsc
 
 all::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
@@ -15,9 +12,10 @@ all::
 clean::
 	$(MAKE) -f $(TOP)/Makefile javascript_clean
 
+javascript_exe::
+	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
+		TOP='$(TOP)' javascript_exe
+
 check:: all
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' javascript_exe
-	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
-
+		TOP='$(TOP)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
diff --git a/Examples/javascript/template/Makefile b/Examples/javascript/template/Makefile
index 1ac61ec6b..180e99cae 100755
--- a/Examples/javascript/template/Makefile
+++ b/Examples/javascript/template/Makefile
@@ -1,12 +1,9 @@
 TOP = ../..
 SWIG = $(TOP)/../preinst-swig
-JAVASCRIPT_EXE = $(TOP)/../Tools/javascript/javascript
 CXXSRCS    = example.cpp
-JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JS_SCRIPT = runme.js
 TARGET = example
 INTERFACE = example.i
-SWIGOPT = -I$(TOP)/../Lib/javascript -I$(TOP)/../Lib/javascript/jsc
 
 all::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
@@ -15,9 +12,10 @@ all::
 clean::
 	$(MAKE) -f $(TOP)/Makefile javascript_clean
 
+javascript_exe::
+	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
+		TOP='$(TOP)' javascript_exe
+
 check:: all
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' javascript_exe
-	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
-
+		TOP='$(TOP)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
diff --git a/Examples/javascript/variables/Makefile b/Examples/javascript/variables/Makefile
index 4fbfa2802..fb4669329 100755
--- a/Examples/javascript/variables/Makefile
+++ b/Examples/javascript/variables/Makefile
@@ -1,12 +1,9 @@
 TOP = ../..
 SWIG = $(TOP)/../preinst-swig
-JAVASCRIPT_EXE = $(TOP)/../Tools/javascript/javascript
 SRCS    = example.c
-JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JS_SCRIPT = runme.js
 TARGET = example
 INTERFACE = example.i
-SWIGOPT = -I$(TOP)/../Lib/javascript -I$(TOP)/../Lib/javascript/jsc
 
 all::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
@@ -15,9 +12,10 @@ all::
 clean::
 	$(MAKE) -f $(TOP)/Makefile javascript_clean
 
+javascript_exe::
+	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
+		TOP='$(TOP)' javascript_exe
+
 check:: all
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' javascript_exe
-	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
-
+		TOP='$(TOP)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run