Merge branch 'aarch64-ahs3'

8 files changed, 15 insertions, 15 deletions

diff --git a/recipe.d/0020-openssl b/recipe.d/0020-openssl
index 195fb26..ca3f633 100644
--- a/recipe.d/0020-openssl
+++ b/recipe.d/0020-openssl
@@ -3,13 +3,13 @@
         mcd $BUILDDIR/openssl
         cd $SRC/openssl-*
 ./Configure \
-	--prefix=/usr --openssldir=/etc/pki/tls \
+	--prefix=/usr --libdir=lib${SUFFIX} --openssldir=/etc/pki/tls \
 	zlib enable-camellia enable-seed enable-tlsext enable-rfc3779 \
 	enable-cms enable-md2 no-idea no-mdc2 no-rc5 no-ec no-ec2m no-ecdh no-ecdsa no-srp \
-	--enginesdir=/usr/lib/openssl/engines \
+	--enginesdir=/usr/lib${SUFFIX}/openssl/engines \
 	shared  linux-generic32 fips
 
-#       ./Configure --prefix=/usr --openssldir=/etc/pki/tls zlib enable-camellia enable-seed enable-tlsext enable-rfc3779 enable-cms enable-md2 no-idea no-mdc2 no-rc5 no-ec no-ecdh no-ecdsa no-srp fips shared linux-generic32
+#       ./Configure --prefix=/usr --openssldir=/etc/pki/tls --libdir=/usr/lib${SUFFIX} zlib enable-camellia enable-seed enable-tlsext enable-rfc3779 enable-cms enable-md2 no-idea no-mdc2 no-rc5 no-ec no-ecdh no-ecdsa no-srp fips shared linux-generic32
 
         make depend
         make all
diff --git a/recipe.d/0023-nss-util b/recipe.d/0023-nss-util
index aeaafba..1d7b586 100644
--- a/recipe.d/0023-nss-util
+++ b/recipe.d/0023-nss-util
@@ -12,7 +12,7 @@ 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
 
@@ -37,7 +37,7 @@ cd $SRC/nss-util-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
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
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
diff --git a/recipe.d/0035-redhat-rpm-config b/recipe.d/0035-redhat-rpm-config
index 7bbdd2b..6ab3c38 100644
--- a/recipe.d/0035-redhat-rpm-config
+++ b/recipe.d/0035-redhat-rpm-config
@@ -6,4 +6,4 @@
 
 	cd $SRC/redhat-rpm-config-*
 	make install
-	cp -p /usr/share/libtool/config/config.{guess,sub} /usr/lib/rpm/redhat/
+	cp -p /usr/share/libtool/config/config.{guess,sub} /usr/lib${SUFFIX}/rpm/redhat/
diff --git a/recipe.d/0102-attr b/recipe.d/0102-attr
index 757031f..61744f2 100644
--- a/recipe.d/0102-attr
+++ b/recipe.d/0102-attr
@@ -3,7 +3,7 @@
 
 mcd $BUILDDIR/attr
 rsync -av $SRC/attr-*/ ./
-./configure $TCONFIGARGS --libexecdir=/usr/lib
+./configure $TCONFIGARGS --libexecdir=/usr/lib${SUFFIX}
 make $J LIBTOOL="libtool --tag=CC"
 make $J install
 make $J install-dev
diff --git a/recipe.d/0103-acl b/recipe.d/0103-acl
index 000ad52..08959fe 100644
--- a/recipe.d/0103-acl
+++ b/recipe.d/0103-acl
@@ -5,7 +5,7 @@
 mcd $BUILDDIR/acl
 rsync -av $SRC/acl-*/ ./
 touch .census
-./configure $TCONFIGARGS --libexecdir=/usr/lib
+./configure $TCONFIGARGS --libexecdir=/usr/lib${SUFFIX}
 make $J LIBTOOL="libtool --tag=CC"
 make $J install
 make $J install-dev
diff --git a/recipe.d/0105-pam b/recipe.d/0105-pam
index dab92c2..ce1f6de 100644
--- a/recipe.d/0105-pam
+++ b/recipe.d/0105-pam
@@ -13,7 +13,7 @@ mcd $BUILDDIR/pam
 rsync -av $SRC/Linux-PAM-*/ ./
 	
 ./configure \
-	--libdir=/lib \
+	--libdir=/lib${SUFFIX} \
 	--includedir=/usr/include/security \
 	--disable-prelude \
 	--disable-selinux \