From ee2a39fa88cbacf6e9dc1a79ec764dda732fca56 Mon Sep 17 00:00:00 2001
From: "saul.edwards%sun.com"
 <saul.edwards%sun.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 17 Sep 2004 22:25:50 +0000
Subject: [PATCH] 258779: Add /usr/lib/mps to RPATH for Solaris 10.

git-svn-id: svn://10.0.0.236/trunk@162514 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/security/nss/lib/nss/config.mk | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mozilla/security/nss/lib/nss/config.mk b/mozilla/security/nss/lib/nss/config.mk
index ec2e8ece783..22da1edc274 100644
--- a/mozilla/security/nss/lib/nss/config.mk
+++ b/mozilla/security/nss/lib/nss/config.mk
@@ -107,10 +107,19 @@ SHARED_LIBRARY_DIRS = \
 
 
 ifeq ($(OS_TARGET),SunOS)
+ifeq ($(BUILD_SUN_PKG), 1)
 # The -R '$ORIGIN' linker option instructs this library to search for its
 # dependencies in the same directory where it resides.
+ifeq ($(USE_64), 1)
+MKSHLIB += -R '$$ORIGIN:/usr/lib/mps/secv1/sparcv9:/usr/lib/mps/sparcv9'
+else
+MKSHLIB += -R '$$ORIGIN:/usr/lib/mps/secv1:/usr/lib/mps'
+endif
+else
 MKSHLIB += -R '$$ORIGIN'
 endif
+endif
+
 
 ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET)))
 ifndef NS_USE_GCC