diff --git a/config/Makefile.in b/config/Makefile.in
index 50e4a7bff272..7d25187f0a89 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -132,3 +132,8 @@ show_objname:
 	@echo $(OBJDIR)
 
 .PHONY: show_objname
+
+RUN_MOZILLA_SCRIPT= $(topsrcdir)/build/run-mozilla.sh
+
+export:: $(RUN_MOZILLA_SCRIPT)
+	$(INSTALL) $(RUN_MOZILLA_SCRIPT) $(DIST)/bin
diff --git a/webshell/tests/viewer/mozilla-viewer.sh b/webshell/tests/viewer/mozilla-viewer.sh
index c13ac2848a81..c563af8f8fad 100755
--- a/webshell/tests/viewer/mozilla-viewer.sh
+++ b/webshell/tests/viewer/mozilla-viewer.sh
@@ -28,18 +28,18 @@
 ## the viewer work.
 ##
 
-tools=""
+dist_bin=""
 
 # Running from dist/bin
 if [ -d components -a -d res ]
 then
-	tools="../../build"
+	dist_bin="./"
 else
 	# Running from source dir
 	if [ -f Makefile.in ]
 	then
-		tools=`grep -w DEPTH Makefile.in  | grep -e "\.\." | awk -F"=" '{ print $2; }'`/build
+		dist_bin=`grep -w DEPTH Makefile.in  | grep -e "\.\." | awk -F"=" '{ print $2; }'`/dist/bin
 	fi
 fi
 
-$tools/run-mozilla.sh viewer ${1+"$@"}
+$dist_bin/run-mozilla.sh viewer ${1+"$@"}
diff --git a/xpfe/bootstrap/mozilla-apprunner.sh b/xpfe/bootstrap/mozilla-apprunner.sh
index 507126b2aa23..44a606bc9837 100755
--- a/xpfe/bootstrap/mozilla-apprunner.sh
+++ b/xpfe/bootstrap/mozilla-apprunner.sh
@@ -28,18 +28,18 @@
 ## the apprunner work.
 ##
 
-tools=""
+dist_bin=""
 
 # Running from dist/bin
 if [ -d components -a -d res ]
 then
-	tools="../../build"
+	dist_bin="./"
 else
 	# Running from source dir
 	if [ -f Makefile.in ]
 	then
-		tools=`grep -w DEPTH Makefile.in  | grep -e "\.\." | awk -F"=" '{ print $2; }'`/build
+		dist_bin=`grep -w DEPTH Makefile.in  | grep -e "\.\." | awk -F"=" '{ print $2; }'`/dist/bin
 	fi
 fi
 
-$tools/run-mozilla.sh apprunner ${1+"$@"}
+$dist_bin/run-mozilla.sh apprunner ${1+"$@"}