diff options
author | Simon Stelling <blubb@gentoo.org> | 2004-09-30 09:21:48 +0000 |
---|---|---|
committer | Simon Stelling <blubb@gentoo.org> | 2004-09-30 09:21:48 +0000 |
commit | f4762f9ec3970f6880cadc39f5708b715eb6dd4e (patch) | |
tree | 194c893258930c513c279c03be09b8c3d1415914 /sys-libs/cracklib | |
parent | Marked stable on x86 (Manifest recommit) (diff) | |
download | gentoo-2-f4762f9ec3970f6880cadc39f5708b715eb6dd4e.tar.gz gentoo-2-f4762f9ec3970f6880cadc39f5708b715eb6dd4e.tar.bz2 gentoo-2-f4762f9ec3970f6880cadc39f5708b715eb6dd4e.zip |
get_libdir
Diffstat (limited to 'sys-libs/cracklib')
-rw-r--r-- | sys-libs/cracklib/ChangeLog | 5 | ||||
-rw-r--r-- | sys-libs/cracklib/cracklib-2.7-r9.ebuild | 18 |
2 files changed, 13 insertions, 10 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/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 } |