get_libdir

3 files changed, 18 insertions, 15 deletions

diff --git a/sys-libs/cracklib/ChangeLog b/sys-libs/cracklib/ChangeLog
index 5d6054eee167..8a7fedc43aca 100644
--- a/sys-libs/cracklib/ChangeLog
+++ b/sys-libs/cracklib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/cracklib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.52 2004/09/01 12:26:31 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.53 2004/09/30 09:21:48 blubb Exp $
+
+  30 Sep 2004; Simon Stelling <blubb@gentoo.org> cracklib-2.7-r9.ebuild:
+  get_libdir-ized
 
   01 Sep 2004; Travis Tilley <lv@gentoo.org> +files/cracklib-2.7-libdir.patch,
   cracklib-2.7-r10.ebuild:
diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index 5e89156e19a6..6f52fb51c062 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -1,15 +1,15 @@
+MD5 316b03658e9dfe67cc66d4b2db49cbd2 ChangeLog 7250
+MD5 e4c517d9f2bd0045de393ce88f440dd7 cracklib-2.7-r10.ebuild 2680
 MD5 0caeace3cd28436acc33312d706e96ae cracklib-2.7-r7.ebuild 1428
-MD5 5262da5fa8bd20e14fbaff61a038312f cracklib-2.7-r9.ebuild 2336
 MD5 ef6d24922a3b097c8dc393fb3eae36f8 cracklib-2.7-r8.ebuild 1702
-MD5 0bc32db872e6291dcd80e65816735bfa ChangeLog 7155
-MD5 e4c517d9f2bd0045de393ce88f440dd7 cracklib-2.7-r10.ebuild 2680
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 f27fad03a3939b6e405193b419b645a4 files/digest-cracklib-2.7-r10 63
+MD5 b363f3a97827e6b2d42b827a61552c9f cracklib-2.7-r9.ebuild 2453
 MD5 85783b83e5bfa51190033895cfaf803e files/cracklib-2.7-dec-alpha-compiler.diff 333
+MD5 9c566d6a249f8d02ad419aac76fffd66 files/cracklib-2.7-gentoo-new.diff 4244
 MD5 336ab4f8ce8e3a3955ec8722d32076b4 files/cracklib-2.7-gzip.patch 521
 MD5 954e8e0d53c6f878366e472a90917356 files/cracklib-2.7-redhat.patch 1224
 MD5 cd32ee2bf36a5facd5b5eb5d99aa66ee files/cracklib-2.7-static-lib.patch 1346
-MD5 9c566d6a249f8d02ad419aac76fffd66 files/cracklib-2.7-gentoo-new.diff 4244
+MD5 f27fad03a3939b6e405193b419b645a4 files/digest-cracklib-2.7-r10 63
 MD5 f27fad03a3939b6e405193b419b645a4 files/digest-cracklib-2.7-r7 63
 MD5 f27fad03a3939b6e405193b419b645a4 files/digest-cracklib-2.7-r8 63
 MD5 f27fad03a3939b6e405193b419b645a4 files/digest-cracklib-2.7-r9 63
diff --git a/sys-libs/cracklib/cracklib-2.7-r9.ebuild b/sys-libs/cracklib/cracklib-2.7-r9.ebuild
index 0038c165a5ca..5173422d74ca 100644
--- a/sys-libs/cracklib/cracklib-2.7-r9.ebuild
+++ b/sys-libs/cracklib/cracklib-2.7-r9.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/cracklib/cracklib-2.7-r9.ebuild,v 1.9 2004/07/21 20:33:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r9.ebuild,v 1.10 2004/09/30 09:21:48 blubb Exp $
 
 inherit flag-o-matic eutils
 
@@ -50,30 +50,30 @@ src_compile() {
 }
 
 src_install() {
-	dodir /usr/{lib,sbin,include} /lib
+	dodir /usr/{$(get_libdir),sbin,include} /$(get_libdir)
 	keepdir /usr/share/cracklib
 
 	make DESTDIR="${D}" install || die "make install failed"
 
 	# Needed by pam
-	if [ ! -f "${D}/usr/lib/libcrack.a" ] && use pam
+	if [ ! -f "${D}/usr/$(get_libdir)/libcrack.a" ] && use pam
 	then
 		eerror "Could not find libcrack.a which is needed by core components!"
 		die "Could not find libcrack.a which is needed by core components!"
 	fi
 
 	# correct permissions on static lib
-	[ -x ${D}/usr/lib/libcrack.a ] && fperms 644 usr/lib/libcrack.a
+	[ -x ${D}/usr/$(get_libdir)/libcrack.a ] && fperms 644 usr/$(get_libdir)/libcrack.a
 
 	# put libcrack.so.2.7 in /lib for cases where /usr isn't available yet
-	mv ${D}/usr/lib/libcrack.so* ${D}/lib
+	mv ${D}/usr/$(get_libdir)/libcrack.so* ${D}/$(get_libdir)
 
 	# This link is needed and not created. :| bug #9611
-	cd ${D}/lib
-	dosym libcrack.so.2.7 /lib/libcrack.so.2
+	cd ${D}/$(get_libdir)
+	dosym libcrack.so.2.7 /$(get_libdir)/libcrack.so.2
 
 	# remove it, if not needed
-	use pam || rm -f ${D}/usr/lib/libcrack.a
+	use pam || rm -f ${D}/usr/$(get_libdir)/libcrack.a
 
 	cd ${S}
 
@@ -81,7 +81,7 @@ src_install() {
 	#fix the permissions on it as they may be wrong in some cases
 	fperms 644 usr/include/packer.h
 
-	preplib /usr/lib /lib
+	preplib /usr/$(get_libdir) /$(get_libdir)
 
 	dodoc HISTORY LICENCE MANIFEST POSTER README
 }