diff options
author | 2008-03-08 20:50:47 +0000 | |
---|---|---|
committer | 2008-03-08 20:50:47 +0000 | |
commit | 67dd3b33a74592bc0da7fcff28c89cd6de6fcf71 (patch) | |
tree | 6aead3f893b9e8136ae88193bc179c9d484acfe6 /dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.5.ebuild | |
parent | unquote A, x86 stable, bug #212667 (diff) | |
download | gentoo-2-67dd3b33a74592bc0da7fcff28c89cd6de6fcf71.tar.gz gentoo-2-67dd3b33a74592bc0da7fcff28c89cd6de6fcf71.tar.bz2 gentoo-2-67dd3b33a74592bc0da7fcff28c89cd6de6fcf71.zip |
Fix multilib handling, bug #208425
(Portage version: 2.1.4.4)
Diffstat (limited to 'dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.5.ebuild')
-rw-r--r-- | dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.5.ebuild | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.5.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.5.ebuild index 90c20c4ca885..657ae95c9688 100644 --- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.5.ebuild +++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.5.ebuild,v 1.4 2007/01/31 13:49:45 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.5.ebuild,v 1.5 2008/03/08 20:50:47 dertobi123 Exp $ inherit eutils @@ -39,23 +39,23 @@ src_unpack() { src_install() { # library - dodir /usr/lib/oracle/${PV}/client/lib + dodir /usr/$(get_libdir)/oracle/${PV}/client/lib cd ${S}/instantclient10_1 - insinto /usr/lib/oracle/${PV}/client/lib + insinto /usr/$(get_libdir)/oracle/${PV}/client/lib doins *.jar *.so *.so.10.1 # fixes symlinks - dosym /usr/lib/oracle/${PV}/client/lib/libocci.so.10.1 /usr/lib/oracle/${PV}/client/lib/libocci.so - dosym /usr/lib/oracle/${PV}/client/lib/libclntsh.so.10.1 /usr/lib/oracle/${PV}/client/lib/libclntsh.so + dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libocci.so.10.1 /usr/$(get_libdir)/oracle/${PV}/client/lib/libocci.so + dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libclntsh.so.10.1 /usr/$(get_libdir)/oracle/${PV}/client/lib/libclntsh.so # includes - dodir /usr/lib/oracle/${PV}/client/include - insinto /usr/lib/oracle/${PV}/client/include + dodir /usr/$(get_libdir)/oracle/${PV}/client/include + insinto /usr/$(get_libdir)/oracle/${PV}/client/include cd ${S}/instantclient10_1/sdk/include doins *.h # link to original location dodir /usr/include/oracle/${PV}/ - ln -s ${D}/usr/lib/oracle/${PV}/client/include ${D}/usr/include/oracle/${PV}/client + ln -s ${D}/usr/$(get_libdir)/oracle/${PV}/client/include ${D}/usr/include/oracle/${PV}/client # share info cd ${S}/instantclient10_1/sdk/demo @@ -63,9 +63,9 @@ src_install() { # Add OCI libs to library path dodir /etc/env.d - echo "ORACLE_HOME=/usr/lib/oracle/${PV}/client" >> ${D}/etc/env.d/50oracle-instantclient-basic - echo "LDPATH=/usr/lib/oracle/${PV}/client/lib" >> ${D}/etc/env.d/50oracle-instantclient-basic - echo "C_INCLUDE_PATH=/usr/lib/oracle/${PV}/client/include" >> ${D}/etc/env.d/50oracle-instantclient-basic + echo "ORACLE_HOME=/usr/$(get_libdir)/oracle/${PV}/client" >> ${D}/etc/env.d/50oracle-instantclient-basic + echo "LDPATH=/usr/$(get_libdir)/oracle/${PV}/client/lib" >> ${D}/etc/env.d/50oracle-instantclient-basic + echo "C_INCLUDE_PATH=/usr/$(get_libdir)/oracle/${PV}/client/include" >> ${D}/etc/env.d/50oracle-instantclient-basic } |