From 989ff8e43ac4f5abaa7a5a23f5c364de7eb4acea Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@delorie.com>
Date: Tue, 26 Jun 2012 21:49:09 -0400
Subject: F17 udpates

Various updates to stage 1 and 2 to build with F17 GA SRPMs
---
 recipe.d/0025-nss | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'recipe.d/0025-nss')

diff --git a/recipe.d/0025-nss b/recipe.d/0025-nss
index 19b631d..0050a57 100644
--- a/recipe.d/0025-nss
+++ b/recipe.d/0025-nss
@@ -15,17 +15,21 @@
         export NSPR_LIB_DIR
         NSS_USE_SYSTEM_SQLITE=1
         export NSS_USE_SYSTEM_SQLITE
-        make -C $SRC/${1}-3.12.10/mozilla/security/coreconf
-        make -C $SRC/${1}-3.12.10/mozilla/security/dbm
-        make -C $SRC/${1}-3.12.10/mozilla/security/nss
-        cd $SRC/${1}-3.12.10/mozilla/security/coreconf
+
+	FREEBL_LIB_DIR=/usr/lib
+	export FREEBL_LIB_DIR
+
+        make -C $SRC/${1}-3.*/mozilla/security/coreconf
+        make -C $SRC/${1}-3.*/mozilla/security/dbm
+        make -C $SRC/${1}-3.*/mozilla/security/nss
+        cd $SRC/${1}-3.*/mozilla/security/coreconf
         make install
-        cd $SRC/${1}-3.12.10/mozilla/security/dbm
+        cd $SRC/${1}-3.*/mozilla/security/dbm
         make install
-        cd $SRC/${1}-3.12.10/mozilla/security/nss
+        cd $SRC/${1}-3.*/mozilla/security/nss
         make install
 	# Copy the binary libraries we want
-	cd $SRC/${1}-3.12.10
+	cd $SRC/${1}-3.*
 	for file in libnss3.so libnssckbi.so libnsspem.so libnsssysinit.so libsmime3.so libssl3.so libnssutil3.so libnssdbm3.chk libfreebl3.chk libfreebl3.so libnssdbm3.so libsoftokn3.chk libsoftokn3.so
 	do
 	  install -p -m 755 mozilla/dist/*.OBJ/lib/$file /usr/lib/
-- 
cgit