--- mozilla/nsprpub/config/nspr-config.in.nsprlib64	2003-02-27 20:52:53.000000000 -0500
+++ mozilla/nsprpub/config/nspr-config.in	2004-11-19 09:29:20.222446195 -0500
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 prefix=@prefix@
+libdir=@libdir@
 exec_prefix=@exec_prefix@
 exec_prefix_set=no
 
@@ -44,6 +45,7 @@
     --prefix=*)
       prefix=$optarg
       if test $exec_prefix_set = no ; then
+        prefix_set=yes
         exec_prefix=$optarg
       fi
       ;;
@@ -95,7 +97,11 @@
 fi
 
 if test "$echo_libs" = "yes"; then
-      libdirs=-L${exec_prefix}/lib
+      if test "$prefix_set" = "yes" -o "$exec_prefix_set" = "yes"; then
+	      libdirs=-L${exec_prefix}/lib
+      else
+              libdirs=-L${libdir}
+      fi
       if test -n "$lib_plds"; then
 	libdirs="$libdirs -lplds${major_version}"
       fi