diff --git a/libs/js/nsprpub/configure b/libs/js/nsprpub/configure
index d83a3a7465..ad26d27357 100755
--- a/libs/js/nsprpub/configure
+++ b/libs/js/nsprpub/configure
@@ -3326,7 +3326,7 @@ EOF
             ;;
     esac
     DSO_CFLAGS=-fPIC
-    DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names'
+    DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name $dist_libdir/$@ -headerpad_max_install_names'
     # Use the standard preprocessor (cpp)
     CFLAGS="$CFLAGS -no-cpp-precomp"
     MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
@@ -3896,23 +3896,11 @@ EOF
         PR_MD_ASFILES=os_Linux_ia64.s
         ;;
     x86_64)
-        if test -n "$USE_64"; then
             PR_MD_ASFILES=os_Linux_x86_64.s
-        else
-            cat >> confdefs.h <<\EOF
-#define i386 1
-EOF
-
-            PR_MD_ASFILES=os_Linux_x86.s
-            CC="$CC -m32"
-            CXX="$CXX -m32"
-        fi
         ;;
     powerpc64)
-        if test -n "$USE_64"; then
             CC="$CC -m64"
             CXX="$CXX -m64"
-        fi
         ;;
     m68k)
         CFLAGS="$CFLAGS -m68020-60"
diff --git a/libs/js/nsprpub/configure.in b/libs/js/nsprpub/configure.in
index 1775d683f6..6a462be3d5 100644
--- a/libs/js/nsprpub/configure.in
+++ b/libs/js/nsprpub/configure.in
@@ -975,7 +975,7 @@ case "$target" in
             ;;
     esac
     DSO_CFLAGS=-fPIC
-    DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names'
+    DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name $dist_libdir/$@ -headerpad_max_install_names'
     # Use the standard preprocessor (cpp)
     CFLAGS="$CFLAGS -no-cpp-precomp"
     MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
@@ -1425,20 +1425,11 @@ tools are selected during the Xcode/Developer Tools installation.])
         PR_MD_ASFILES=os_Linux_ia64.s
         ;;
     x86_64)
-        if test -n "$USE_64"; then
             PR_MD_ASFILES=os_Linux_x86_64.s
-        else
-            AC_DEFINE(i386)
-            PR_MD_ASFILES=os_Linux_x86.s
-            CC="$CC -m32"
-            CXX="$CXX -m32"
-        fi
         ;;
     powerpc64)
-        if test -n "$USE_64"; then
             CC="$CC -m64"
             CXX="$CXX -m64"
-        fi
         ;;
     m68k)
         CFLAGS="$CFLAGS -m68020-60"