diff options
| author | Arwed von Merkatz | 2010-04-19 16:45:13 +0200 |
|---|---|---|
| committer | Arwed von Merkatz | 2010-04-19 20:41:25 +0200 |
| commit | f49ddd78fe5cfefec32d205648b8c701d7e0e3c4 (patch) | |
| tree | d22e22f496e0749b2983491c5ce6b6cda15b7d2b | |
| parent | ec70edcaf33f2de16d3df3173f0d117d4e63ef6e (diff) | |
nss: fixed BUILD to work for DEFAULT branch, bug 15680
(cherry picked from commit 3a07b7dc32d74968b78155c033ade805aefae601)
| -rwxr-xr-x | crypto/nss/BUILD | 2 | ||||
| -rw-r--r-- | crypto/nss/HISTORY | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/crypto/nss/BUILD b/crypto/nss/BUILD index d03751344f..7a287c01b9 100755 --- a/crypto/nss/BUILD +++ b/crypto/nss/BUILD @@ -13,7 +13,7 @@ cd $SOURCE_DIRECTORY/mozilla/security/coreconf && echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' >> headers.mk && -if [[ $NSS_BRANCH != 3.12 ]]; then +if [[ $NSS_BRANCH == 3.11 ]]; then sedit 's:$(DIST)/lib:/usr/lib/nspr:' location.mk fi && diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY index fefab15344..cfdd68e29b 100644 --- a/crypto/nss/HISTORY +++ b/crypto/nss/HISTORY @@ -1,3 +1,7 @@ +2010-04-19 Arwed v. Merkatz <v.merkatz@gmx.net> + * BUILD: fixed location.mk sedit to only apply to 3.11, not DEFAULT + branch, fixes bug #15680 + 2010-03-26 Ladislav Hagara <hgr@vabo.cz> * DETAILS, PRE_BUILD, BUILD, INSTALL: used official nss tarball |