diff options
| author |   Jonathan Callen <abcd@gentoo.org> | 2010-06-08 01:19:09 +0000 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2010-06-08 01:19:09 +0000 |
| commit | 0f56e3eab60bf1e96c1e0c4ac0dbca60d03bd182 (patch) | |
| tree | 498390ad72893c1dedab82a3c3e8684359f8c068 /app-text | |
| parent | Delete calls to deprecated python_version(). (diff) | |
| download | gentoo-2-0f56e3eab60bf1e96c1e0c4ac0dbca60d03bd182.tar.gz gentoo-2-0f56e3eab60bf1e96c1e0c4ac0dbca60d03bd182.tar.bz2 gentoo-2-0f56e3eab60bf1e96c1e0c4ac0dbca60d03bd182.zip | |
Fix bug 232103 by setting PREFIX="${EPREFIX}/usr" instead of just ${EPREFIX}: ${EPREFIX} alone was never correct
(Portage version: 2.2_rc67/cvs/Linux i686)
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/highlight/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/highlight/highlight-2.9.ebuild | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/app-text/highlight/ChangeLog b/app-text/highlight/ChangeLog index 1fbe6d8ebc3e..a6af0053f723 100644 --- a/app-text/highlight/ChangeLog +++ b/app-text/highlight/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/highlight # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/ChangeLog,v 1.30 2010/04/05 16:46:31 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/ChangeLog,v 1.31 2010/06/08 01:19:09 abcd Exp $ + + 08 Jun 2010; Jonathan Callen <abcd@gentoo.org> highlight-2.9.ebuild: + Fix bug 232103 by setting PREFIX="${EPREFIX}/usr" instead of just + ${EPREFIX}: ${EPREFIX} alone was never correct 05 Apr 2010; Raúl Porcel <armin76@gentoo.org> highlight-2.9.ebuild: sparc stable wrt #306711 diff --git a/app-text/highlight/highlight-2.9.ebuild b/app-text/highlight/highlight-2.9.ebuild index 12ff637ccc02..10d06f0d5eda 100644 --- a/app-text/highlight/highlight-2.9.ebuild +++ b/app-text/highlight/highlight-2.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-2.9.ebuild,v 1.8 2010/04/05 16:46:31 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-2.9.ebuild,v 1.9 2010/06/08 01:19:09 abcd Exp $ EAPI=3 inherit eutils toolchain-funcs @@ -25,11 +25,11 @@ src_prepare() { } src_compile() { - emake -f makefile PREFIX="${EPREFIX}" conf_dir="${EPREFIX}"/etc/highlight/ CXX="$(tc-getCXX)" \ + emake -f makefile PREFIX="${EPREFIX}/usr" conf_dir="${EPREFIX}"/etc/highlight/ CXX="$(tc-getCXX)" \ || die "emake failed" if use qt4; then - emake -j1 -f makefile PREFIX="${EPREFIX}" conf_dir="${EPREFIX}"/etc/highlight/ CXX="$(tc-getCXX)" gui \ + emake -j1 -f makefile PREFIX="${EPREFIX}/usr" conf_dir="${EPREFIX}"/etc/highlight/ CXX="$(tc-getCXX)" gui \ || die "emake gui failed" fi } @@ -38,12 +38,12 @@ src_install() { dodir /usr/bin emake -f makefile DESTDIR="${D}" \ - PREFIX="${EPREFIX}" conf_dir="${EPREFIX}"/etc/highlight/ \ + PREFIX="${EPREFIX}/usr" conf_dir="${EPREFIX}"/etc/highlight/ \ install || die "emake install failed" if use qt4; then emake -f makefile DESTDIR="${D}" \ - PREFIX="${EPREFIX}" conf_dir="${EPREFIX}"/etc/highlight/ \ + PREFIX="${EPREFIX}/usr" conf_dir="${EPREFIX}"/etc/highlight/ \ install-gui || die "emake install-gui failed" doicon src/gui-qt/${PN}.xpm domenu ${PN}.desktop |