diff --git a/webshell/tests/viewer/Makefile.in b/webshell/tests/viewer/Makefile.in
index a30b5c7a79a1..10b14d2f866d 100644
--- a/webshell/tests/viewer/Makefile.in
+++ b/webshell/tests/viewer/Makefile.in
@@ -157,7 +157,7 @@ CXXFLAGS += $(TOOLKIT_CFLAGS)
 
 include $(topsrcdir)/config/rules.mk
 
-RUN_VIEWER_SCRIPT=mozilla-viewer.sh
+RUN_VIEWER_SCRIPT= $(srcdir)/mozilla-viewer.sh
 
 install:: $(PROGRAM) $(RUN_VIEWER_SCRIPT)
 	$(INSTALL) $(EXPORT_RESOURCE_SAMPLES) $(DIST)/bin/res/samples
diff --git a/webshell/tests/viewer/mozilla-viewer.sh b/webshell/tests/viewer/mozilla-viewer.sh
index bf4d628d7148..c13ac2848a81 100755
--- a/webshell/tests/viewer/mozilla-viewer.sh
+++ b/webshell/tests/viewer/mozilla-viewer.sh
@@ -28,18 +28,18 @@
 ## the viewer work.
 ##
 
-depth=""
+tools=""
 
 # Running from dist/bin
 if [ -d components -a -d res ]
 then
-	depth="../.."
+	tools="../../build"
 else
 	# Running from source dir
 	if [ -f Makefile.in ]
 	then
-		depth=`grep -w DEPTH Makefile.in  | grep -e "\.\." | awk -F"=" '{ print $2; }'`
+		tools=`grep -w DEPTH Makefile.in  | grep -e "\.\." | awk -F"=" '{ print $2; }'`/build
 	fi
 fi
 
-$depth/build/run-mozilla.sh viewer ${1+"$@"}
+$tools/run-mozilla.sh viewer ${1+"$@"}
diff --git a/xpfe/bootstrap/Makefile.in b/xpfe/bootstrap/Makefile.in
index 20a0a1284865..49be42599637 100644
--- a/xpfe/bootstrap/Makefile.in
+++ b/xpfe/bootstrap/Makefile.in
@@ -95,7 +95,7 @@ CFLAGS += $(TOOLKIT_CFLAGS)
 
 include $(topsrcdir)/config/rules.mk
 
-RUN_APPRUNNER_SCRIPT=mozilla-apprunner.sh
+RUN_APPRUNNER_SCRIPT= $(srcdir)/mozilla-apprunner.sh
 
 install:: $(RUN_APPRUNNER_SCRIPT)
 	$(INSTALL) $(RUN_APPRUNNER_SCRIPT) $(DIST)/bin
diff --git a/xpfe/bootstrap/mozilla-apprunner.sh b/xpfe/bootstrap/mozilla-apprunner.sh
index 1c3fcae9d2e6..507126b2aa23 100755
--- a/xpfe/bootstrap/mozilla-apprunner.sh
+++ b/xpfe/bootstrap/mozilla-apprunner.sh
@@ -28,18 +28,18 @@
 ## the apprunner work.
 ##
 
-depth=""
+tools=""
 
 # Running from dist/bin
 if [ -d components -a -d res ]
 then
-	depth="../.."
+	tools="../../build"
 else
 	# Running from source dir
 	if [ -f Makefile.in ]
 	then
-		depth=`grep -w DEPTH Makefile.in  | grep -e "\.\." | awk -F"=" '{ print $2; }'`
+		tools=`grep -w DEPTH Makefile.in  | grep -e "\.\." | awk -F"=" '{ print $2; }'`/build
 	fi
 fi
 
-$depth/build/run-mozilla.sh apprunner ${1+"$@"}
+$tools/run-mozilla.sh apprunner ${1+"$@"}