diff options
| author |   Dan Armak <danarmak@gentoo.org> | 2002-07-17 11:16:42 +0000 |
|---|---|---|
| committer | Dan Armak <danarmak@gentoo.org> | 2002-07-17 11:16:42 +0000 |
| commit | e2194df2c4205051c7d25fc278a06385e8af96fe (patch) | |
| tree | 31c177a8677e63a978ae252998b95fa39348d1d7 /kde-base | |
| parent | repoman'd (diff) | |
| download | gentoo-2-e2194df2c4205051c7d25fc278a06385e8af96fe.tar.gz gentoo-2-e2194df2c4205051c7d25fc278a06385e8af96fe.tar.bz2 gentoo-2-e2194df2c4205051c7d25fc278a06385e8af96fe.zip | |
final fix to env.d issues
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kdelibs/kdelibs-2.2.2-r4.ebuild | 18 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-3.0.2-r1.ebuild | 16 |
2 files changed, 17 insertions, 17 deletions
diff --git a/kde-base/kdelibs/kdelibs-2.2.2-r4.ebuild b/kde-base/kdelibs/kdelibs-2.2.2-r4.ebuild index 5e3315018b6b..f9ce98e8c02d 100644 --- a/kde-base/kdelibs/kdelibs-2.2.2-r4.ebuild +++ b/kde-base/kdelibs/kdelibs-2.2.2-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2001 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-2.2.2-r4.ebuild,v 1.7 2002/07/17 07:48:29 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-2.2.2-r4.ebuild,v 1.8 2002/07/17 11:16:41 danarmak Exp $ inherit kde kde.org || die #don't inherit kde-dist! it calls need-kde which adds kdelibs to depend -> circular deps! @@ -76,17 +76,17 @@ src_install() { dodir /etc/env.d - if [ "$KDE2DIR" != "$KDE2LIBSDIR" ]; then -echo "PATH=${KDE2LIBSDIR}/bin:${KDE2DIR}/bin -ROOTPATH=${KDE2LIBSDIR}/bin:${KDE2DIR}/bin -LDPATH=${KDE2LIBSDIR}/lib:${KDE2DIR}/lib" > ${D}/etc/env.d/70kdelibs-${PV} + if [ "${PREFIX}" != "/usr/kde/2" ]; then +echo "PATH=${PREFIX}/bin:/usr/kde/2/bin +ROOTPATH=${PREFIX}/bin:/usr/kde/2/bin +LDPATH=${PREFIX}/lib:/usr/kde/2/lib" > ${D}/etc/env.d/70kdelibs-${PV} else -echo "PATH=${KDE2LIBSDIR}/bin -ROOTPATH=${KDE2LIBSDIR}/bin -LDPATH=${KDE2LIBSDIR}/lib" > ${D}/etc/env.d/70kdelibs-${PV} +echo "PATH=${PREFIX}/bin +ROOTPATH=${PREFIX}/bin +LDPATH=${PREFIX}/lib" > ${D}/etc/env.d/70kdelibs-${PV} fi - echo "KDEDIR=${KDE2DIR}" > ${D}/etc/env.d/40kdedir-${PV} + echo "KDEDIR=/usr/kde/2" > ${D}/etc/env.d/40kdedir-${PV} } diff --git a/kde-base/kdelibs/kdelibs-3.0.2-r1.ebuild b/kde-base/kdelibs/kdelibs-3.0.2-r1.ebuild index 1aabba2ec684..2c4c622596f6 100644 --- a/kde-base/kdelibs/kdelibs-3.0.2-r1.ebuild +++ b/kde-base/kdelibs/kdelibs-3.0.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2001 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.0.2-r1.ebuild,v 1.2 2002/07/16 20:57:37 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.0.2-r1.ebuild,v 1.3 2002/07/17 11:16:42 danarmak Exp $ inherit kde kde.org #don't inherit kde-base or kde-dist! it calls need-kde which adds kdelibs to depend! @@ -78,14 +78,14 @@ src_install() { dodir /etc/env.d - if [ "$PREFIX" != "$KDEDIR" ]; then -echo "PATH=${KDEDIR}/bin:/usr/kde/3/bin -ROOTPATH=${KDEDIR}/bin:/usr/kde/3/bin -LDPATH=${KDEDIR}/lib:/usr/kde/3/lib" > ${D}/etc/env.d/65kdelibs-${PV} + if [ "$PREFIX" != "/usr/kde/3" ]; then +echo "PATH=${PREFIX}/bin:/usr/kde/3/bin +ROOTPATH=${PREFIX}/bin:/usr/kde/3/bin +LDPATH=${PREFIX}/lib:/usr/kde/3/lib" > ${D}/etc/env.d/65kdelibs-${PV} else -echo "PATH=${KDEDIR}/bin -ROOTPATH=${KDEDIR}/bin -LDPATH=${KDEDIR}/lib" > ${D}/etc/env.d/65kdelibs-${PV} +echo "PATH=${PREFIX}/bin +ROOTPATH=${PREFIX}/bin +LDPATH=${PREFIX}/lib" > ${D}/etc/env.d/65kdelibs-${PV} fi echo "KDEDIR=/usr/kde/3" > ${D}/etc/env.d/50kdedir-${PV} |