[oe-commits] Koen Kooi : nss: more pkgconfig fixes...

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 0a9a9e89cdce311456e3d90e73014ce08d7a810f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=0a9a9e89cdce311456e3d90e73014ce08d7a810f

Author: Koen Kooi <koen at openembedded.org>
Date:   Fri Apr 16 15:04:37 2010 +0200

nss: more pkgconfig fixes...

---

 recipes/mozilla/nss-3.12.6/nss.pc.in |    2 +-
 recipes/mozilla/nss-3.12/nss.pc.in   |    2 +-
 recipes/mozilla/nss_3.12.6.bb        |    2 ++
 recipes/mozilla/nss_3.12.bb          |    2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/recipes/mozilla/nss-3.12.6/nss.pc.in b/recipes/mozilla/nss-3.12.6/nss.pc.in
index ff29a1e..e72ee5f 100644
--- a/recipes/mozilla/nss-3.12.6/nss.pc.in
+++ b/recipes/mozilla/nss-3.12.6/nss.pc.in
@@ -7,5 +7,5 @@ Name: NSS
 Description: Mozilla Network Security Services
 Version: @VERSION@
 Requires: nspr
-Libs: -L${libdir} -lnss3 -lnssutil3 -lsmime3 -lssl3
+Libs: -L${libdir}/nss -lnss3 -lnssutil3 -lsmime3 -lssl3 
 Cflags: -I${includedir}
diff --git a/recipes/mozilla/nss-3.12/nss.pc.in b/recipes/mozilla/nss-3.12/nss.pc.in
index ff29a1e..55497e3 100644
--- a/recipes/mozilla/nss-3.12/nss.pc.in
+++ b/recipes/mozilla/nss-3.12/nss.pc.in
@@ -7,5 +7,5 @@ Name: NSS
 Description: Mozilla Network Security Services
 Version: @VERSION@
 Requires: nspr
-Libs: -L${libdir} -lnss3 -lnssutil3 -lsmime3 -lssl3
+Libs: -L${libdir}/nss -lnss3 -lnssutil3 -lsmime3 -lssl3
 Cflags: -I${includedir}
diff --git a/recipes/mozilla/nss_3.12.6.bb b/recipes/mozilla/nss_3.12.6.bb
index 6634613..7da316f 100644
--- a/recipes/mozilla/nss_3.12.6.bb
+++ b/recipes/mozilla/nss_3.12.6.bb
@@ -1,6 +1,8 @@
 DESCRIPTION = "Mozilla's SSL and TLS implementation"
 HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/"
 
+PR = "r1"
+
 LICENSE = "MPL1.1 GPL LGPL"
 
 DEPENDS = "sqlite3 nspr"
diff --git a/recipes/mozilla/nss_3.12.bb b/recipes/mozilla/nss_3.12.bb
index c7bc02b..a640895 100644
--- a/recipes/mozilla/nss_3.12.bb
+++ b/recipes/mozilla/nss_3.12.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/"
 
 LICENSE = "MPL1.1 GPL LGPL"
 
-PR = "r2"
+PR = "r3"
 
 DEPENDS = "sqlite3 nspr"