summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Tilley <lv@gentoo.org>2004-08-15 07:00:16 +0000
committerTravis Tilley <lv@gentoo.org>2004-08-15 07:00:16 +0000
commit479dd8e593b88a043bac90aeb4dc87434668cdee (patch)
tree117a75f8547a5ff8c68c2fa286181005049a6666 /app-arch/bzip2
parentver bump #57545 (Manifest recommit) (diff)
downloadgentoo-2-479dd8e593b88a043bac90aeb4dc87434668cdee.tar.gz
gentoo-2-479dd8e593b88a043bac90aeb4dc87434668cdee.tar.bz2
gentoo-2-479dd8e593b88a043bac90aeb4dc87434668cdee.zip
"added CONF_LIBDIR support for installing libbz2 to lib64/lib32
Diffstat (limited to 'app-arch/bzip2')
-rw-r--r--app-arch/bzip2/ChangeLog5
-rw-r--r--app-arch/bzip2/bzip2-1.0.2-r3.ebuild11
2 files changed, 11 insertions, 5 deletions
diff --git a/app-arch/bzip2/ChangeLog b/app-arch/bzip2/ChangeLog
index 84e54de6e965..98a70d64d97d 100644
--- a/app-arch/bzip2/ChangeLog
+++ b/app-arch/bzip2/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-arch/bzip2
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.11 2004/08/05 09:56:39 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.12 2004/08/15 07:00:16 lv Exp $
+
+ 14 Aug 2004; Travis Tilley <lv@gentoo.org> bzip2-1.0.2-r3.ebuild:
+ added CONF_LIBDIR support for installing libbz2 to lib64/lib32
05 Aug 2004; <solar@gentoo.org> bzip2-1.0.2-r3.ebuild:
added local USE flag cross because bzip2 will to run itself after it has
diff --git a/app-arch/bzip2/bzip2-1.0.2-r3.ebuild b/app-arch/bzip2/bzip2-1.0.2-r3.ebuild
index fa1b57831b18..83eaff8bbdc1 100644
--- a/app-arch/bzip2/bzip2-1.0.2-r3.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.2-r3.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/app-arch/bzip2/bzip2-1.0.2-r3.ebuild,v 1.15 2004/08/05 09:56:39 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.2-r3.ebuild,v 1.16 2004/08/15 07:00:16 lv Exp $
inherit gcc flag-o-matic
@@ -62,10 +62,13 @@ src_install() {
fi
done
+ [ -z "${CONF_LIBDIR}" ] && CONF_LIBDIR="lib"
+
+ [ "${CONF_LIBDIR}" != "lib" ] && mv ${D}/usr/lib ${D}/usr/${CONF_LIBDIR}
dolib.so ${S}/libbz2.so.${PV}
- dosym /usr/lib/libbz2.so.${PV} /usr/lib/libbz2.so.1.0
- dosym /usr/lib/libbz2.so.${PV} /usr/lib/libbz2.so
- dosym /usr/lib/libbz2.so.${PV} /usr/lib/libbz2.so.1
+ dosym /usr/${CONF_LIBDIR}/libbz2.so.${PV} /usr/${CONF_LIBDIR}/libbz2.so.1.0
+ dosym /usr/${CONF_LIBDIR}/libbz2.so.${PV} /usr/${CONF_LIBDIR}/libbz2.so
+ dosym /usr/${CONF_LIBDIR}/libbz2.so.${PV} /usr/${CONF_LIBDIR}/libbz2.so.1
dodoc README LICENSE CHANGES Y2K_INFO
docinto txt