summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtchang%redhat.com <devnull@localhost>2005-11-16 02:17:36 +0000
committerwtchang%redhat.com <devnull@localhost>2005-11-16 02:17:36 +0000
commita9f3dee36b22ce9f3ba052bf2ac654a22cdaf309 (patch)
tree8f813f6a7464b9d565e88f9ac1979a940bae9b17
parentcc425ed21b7ccc6fc9b6328b7b28fc9207e3e023 (diff)
downloadnss-hg-a9f3dee36b22ce9f3ba052bf2ac654a22cdaf309.tar.gz
Bugzilla Bug 292427: on Windows, search in $(DIST)/lib before $(DIST)/bin
because in a Mozilla build $(DIST)/bin may contain old copies of the NSS DLLs. r=relyea,jpierre.
-rw-r--r--security/nss/cmd/shlibsign/sign.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/nss/cmd/shlibsign/sign.sh b/security/nss/cmd/shlibsign/sign.sh
index dc373b0a5..97c582a79 100644
--- a/security/nss/cmd/shlibsign/sign.sh
+++ b/security/nss/cmd/shlibsign/sign.sh
@@ -2,7 +2,7 @@
case "${3}" in
WIN*)
if echo "${PATH}" | grep -c \; >/dev/null; then
- PATH=${1}/bin\;${1}/lib\;${4}\;${PATH}
+ PATH=${1}/lib\;${1}/bin\;${4}\;${PATH}
else
# ARG1 is ${1} with the drive letter escaped.
if echo "${1}" | grep -c : >/dev/null; then
@@ -15,7 +15,7 @@ WIN*)
else
ARG4=${4}
fi
- PATH=${ARG1}/bin:${ARG1}/lib:${ARG4}:${PATH}
+ PATH=${ARG1}/lib:${ARG1}/bin:${ARG4}:${PATH}
fi
export PATH
echo ${2}/shlibsign -v -i ${5}