diff options
| author | Al Stone <ahs3@redhat.com> | 2012-11-23 11:30:19 -0700 |
|---|---|---|
| committer | Al Stone <ahs3@redhat.com> | 2012-11-23 11:30:19 -0700 |
| commit | d06ce0302d8e9264313cf91a34dac7cb03ad60ae (patch) | |
| tree | b841650a0ed1539bbf69bd3bbb4d8945137d388c /recipe.d/0025-nss | |
| parent | ed70187232271ca91eb7a00b7369a733f1b72752 (diff) | |
| parent | 56bc03320a53090fdc98322a39cfbb6d2be4cbe5 (diff) | |
| download | bootstrap.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/0025-nss')
| -rw-r--r-- | recipe.d/0025-nss | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipe.d/0025-nss b/recipe.d/0025-nss index de962eb..c57edcc 100644 --- a/recipe.d/0025-nss +++ b/recipe.d/0025-nss @@ -12,13 +12,13 @@ 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 NSS_USE_SYSTEM_SQLITE=1 export NSS_USE_SYSTEM_SQLITE - FREEBL_LIB_DIR=/usr/lib + FREEBL_LIB_DIR=/usr/lib${SUFFIX} export FREEBL_LIB_DIR make -C $SRC/nss-3.*/mozilla/security/coreconf @@ -34,7 +34,7 @@ cd $SRC/nss-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/ + install -p -m 755 mozilla/dist/*.OBJ/lib/$file /usr/lib${SUFFIX}/ done # Copy the include files we want for file in $SRC/nss-*/mozilla/dist/public/nss/*.h |