summaryrefslogtreecommitdiffstats
path: root/recipe.d/0024-nss-softokn
diff options
context:
space:
mode:
authorAl Stone <ahs3@redhat.com>2012-11-23 11:30:19 -0700
committerAl Stone <ahs3@redhat.com>2012-11-23 11:30:19 -0700
commitd06ce0302d8e9264313cf91a34dac7cb03ad60ae (patch)
treeb841650a0ed1539bbf69bd3bbb4d8945137d388c /recipe.d/0024-nss-softokn
parented70187232271ca91eb7a00b7369a733f1b72752 (diff)
parent56bc03320a53090fdc98322a39cfbb6d2be4cbe5 (diff)
downloadbootstrap.git.DONOTUSE-d06ce0302d8e9264313cf91a34dac7cb03ad60ae.tar.gz
bootstrap.git.DONOTUSE-d06ce0302d8e9264313cf91a34dac7cb03ad60ae.tar.xz
bootstrap.git.DONOTUSE-d06ce0302d8e9264313cf91a34dac7cb03ad60ae.zip
Merge branch 'aarch64-ahs3'
Diffstat (limited to 'recipe.d/0024-nss-softokn')
-rw-r--r--recipe.d/0024-nss-softokn6
1 files changed, 3 insertions, 3 deletions
diff --git a/recipe.d/0024-nss-softokn b/recipe.d/0024-nss-softokn
index 7dfc548..aacb85c 100644
--- a/recipe.d/0024-nss-softokn
+++ b/recipe.d/0024-nss-softokn
@@ -14,12 +14,12 @@ export PKG_CONFIG_ALLOW_SYSTEM_LIBS
export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS
NSPR_INCLUDE_DIR=/usr/include/nspr
-NSPR_LIB_DIR=/usr/lib
+NSPR_LIB_DIR=/usr/lib${SUFFIX}
export NSPR_INCLUDE_DIR
export NSPR_LIB_DIR
NSSUTIL_INCLUDE_DIR=/usr/include/nss3
-NSSUTIL_LIB_DIR=/usr/lib
+NSSUTIL_LIB_DIR=/usr/lib${SUFFIX}
export NSSUTIL_INCLUDE_DIR
export NSS_LIB_DIR
@@ -44,7 +44,7 @@ cd $SRC/nss-softokn-3.*
for file in `cd mozilla/dist/*.OBJ/lib; echo *`
do
- install -p -m 755 mozilla/dist/*.OBJ/lib/$file /usr/lib/
+ install -p -m 755 mozilla/dist/*.OBJ/lib/$file /usr/lib${SUFFIX}/
done
# Copy the include files we want
test -d /usr/include/nss3 || mkdir -p /usr/include/nss3