made pam use $(get_libdir) for installing to lib64/lib32

3 files changed, 19 insertions, 16 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index ce62ce64c2e2..4927db213264 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/pam
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.55 2004/08/13 09:05:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.56 2004/09/01 12:47:25 lv Exp $
+
+  01 Sep 2004; Travis Tilley <lv@gentoo.org> pam-0.77-r1.ebuild:
+  made pam use $(get_libdir) for installing to lib64/lib32
 
   13 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> pam-0.77-r1.ebuild:
   fix bug #58626, need a newer autoconf.
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 27f4b65aa3df..e5595f6a4a0a 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -1,9 +1,9 @@
 MD5 5a3b8812bdc05441bc111328d4ef532c pam-0.75-r8.ebuild 3642
 MD5 4892168863088fde282fe93f0631a1ef pam-0.75-r11.ebuild 4612
-MD5 365a2c4d9f29b2534e7263381eff7195 pam-0.77-r1.ebuild 7841
+MD5 98a61a3d99d53cd79790398479ecaa24 pam-0.77-r1.ebuild 7957
 MD5 e526c9cd3928ad7abe8cc1f172600296 pam-0.75-r7.ebuild 4107
 MD5 21709378e42caee8f4061f9aef37de9e pam-0.77.ebuild 7239
-MD5 83665801ed623b2a4b163c7f72790028 ChangeLog 7936
+MD5 233b93764c08d0d3e5fff22b15484eb2 ChangeLog 8056
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 5e2d38e566747b562aa183395eba9721 pam-0.75-r9.ebuild 4096
 MD5 717af9b22f169bd5cf8a51916c1201c6 pam-0.75-r10.ebuild 4222
diff --git a/sys-libs/pam/pam-0.77-r1.ebuild b/sys-libs/pam/pam-0.77-r1.ebuild
index 3b913396928f..a0965c333dbd 100644
--- a/sys-libs/pam/pam-0.77-r1.ebuild
+++ b/sys-libs/pam/pam-0.77-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.77-r1.ebuild,v 1.9 2004/08/13 09:05:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.77-r1.ebuild,v 1.10 2004/09/01 12:47:25 lv Exp $
 
 PATCH_LEVEL="1.2"
 BDB_VER="4.1.25"
@@ -74,9 +74,9 @@ pkg_setup() {
 
 	if use pwdb; then
 		for x in libpwdb.a libcrack.a; do
-			if [ ! -f "${ROOT}/usr/lib/${x}" ]; then
-				eerror "Could not find /usr/lib/${x} needed to build Linux-PAM!"
-				die "Could not find /usr/lib/${x} needed to build Linux-PAM!"
+			if [ ! -f "${ROOT}/usr/$(get_libdir)/${x}" ]; then
+				eerror "Could not find /usr/$(get_libdir)/${x} needed to build Linux-PAM!"
+				die "Could not find /usr/$(get_libdir)/${x} needed to build Linux-PAM!"
 			fi
 		done
 	fi
@@ -170,10 +170,10 @@ src_compile() {
 	einfo "Building Linux-PAM ${PV}..."
 	cd ${S}
 	./configure \
-		--libdir=/lib \
+		--libdir=/$(get_libdir) \
 		--enable-static-libpam \
 		--enable-fakeroot=${D} \
-		--enable-isadir=/lib/security \
+		--enable-isadir=/$(get_libdir)/security \
 		--host=${CHOST} || die
 
 	# Python stuff in docs gives sandbox problems
@@ -230,7 +230,7 @@ src_install() {
 		if [ -d ${x} ]
 		then
 			# Its OK if the module failed when we didnt ask for it anyway
-			if ! ls -1 ${D}/lib/security/$(basename ${x})*.so &> /dev/null
+			if ! ls -1 ${D}/$(get_libdir)/security/$(basename ${x})*.so &> /dev/null
 			then
 				if ! use berkdb && [ "$(basename ${x})" = "pam_userdb" ]
 				then
@@ -250,28 +250,28 @@ src_install() {
 			# Remove the ones we didnt want if it ended up building ok anyways
 				if ! use berkdb && [ "$(basename ${x})" = "pam_userdb" ]
 				then
-					rm -f ${D}/lib/security/pam_userdb*
+					rm -f ${D}/$(get_libdir)/security/pam_userdb*
 				fi
 				if ! use pwdb && [ "$(basename ${x})" = "pam_pwdb" ]
 				then
-					rm -f ${D}/lib/security/pam_pwdb*
+					rm -f ${D}/$(get_libdir)/security/pam_pwdb*
 				fi
 				if ! use pwdb && [ "$(basename ${x})" = "pam_radius" ]
 				then
-					rm -f ${D}/lib/security/pam_radius*
+					rm -f ${D}/$(get_libdir)/security/pam_radius*
 				fi
 			fi
 		fi
 	done
 
-	dodir /usr/lib
-	cd ${D}/lib
+	dodir /usr/$(get_libdir)
+	cd ${D}/$(get_libdir)
 	for x in pam pamc pam_misc
 	do
 		rm lib${x}.so
 		ln -s lib${x}.so.${PV} lib${x}.so
 		ln -s lib${x}.so.${PV} lib${x}.so.0
-		mv lib${x}.a ${D}/usr/lib
+		mv lib${x}.a ${D}/usr/$(get_libdir)
 		# See bug #4411
 		gen_usr_ldscript lib${x}.so
 	done