diff --git a/config/rules.mk b/config/rules.mk
index f06a7ba789b6..f6df5cf9419d 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -238,7 +238,12 @@ ifdef CPP_UNIT_TESTS
 CPPSRCS += $(CPP_UNIT_TESTS)
 SIMPLE_PROGRAMS += $(CPP_UNIT_TESTS:.cpp=$(BIN_SUFFIX))
 INCLUDES += -I$(DIST)/include/testing
-LIBS += $(XPCOM_GLUE_LDOPTS) $(NSPR_LIBS) $(MOZ_JS_LIBS)
+LIBS += $(XPCOM_GLUE_LDOPTS) $(NSPR_LIBS)
+ifdef JS_SHARED_LIBRARY
+ifdef MOZ_SHARK
+LIBS += $(MOZ_JS_LIBS)
+endif
+endif
 
 # ...and run them the usual way
 check::
diff --git a/configure.in b/configure.in
index 29864c5845aa..2b43d021b7c1 100644
--- a/configure.in
+++ b/configure.in
@@ -1301,7 +1301,7 @@ MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH,bz2,$(DEPTH)/modules/libbz2/src)'
 MOZ_PNG_CFLAGS=
 MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/media/libpng)'
 
-MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(LIBXUL_DIST)/lib)'
+MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(DEPTH)/js/src)'
 MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)'
 DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core -lmozalloc'
 MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 342695e25096..733fb28a0751 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -93,7 +93,6 @@ ifdef JS_SHARED_LIBRARY
 FORCE_SHARED_LIB = 1
 endif
 FORCE_STATIC_LIB = 1
-DIST_INSTALL = 1
 
 VPATH		= \
 		$(srcdir) \
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index f06a7ba789b6..f6df5cf9419d 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -238,7 +238,12 @@ ifdef CPP_UNIT_TESTS
 CPPSRCS += $(CPP_UNIT_TESTS)
 SIMPLE_PROGRAMS += $(CPP_UNIT_TESTS:.cpp=$(BIN_SUFFIX))
 INCLUDES += -I$(DIST)/include/testing
-LIBS += $(XPCOM_GLUE_LDOPTS) $(NSPR_LIBS) $(MOZ_JS_LIBS)
+LIBS += $(XPCOM_GLUE_LDOPTS) $(NSPR_LIBS)
+ifdef JS_SHARED_LIBRARY
+ifdef MOZ_SHARK
+LIBS += $(MOZ_JS_LIBS)
+endif
+endif
 
 # ...and run them the usual way
 check::