diff options
| author |   Olivier Fisette <ribosome@gentoo.org> | 2008-11-03 22:17:50 +0000 |
|---|---|---|
| committer | Olivier Fisette <ribosome@gentoo.org> | 2008-11-03 22:17:50 +0000 |
| commit | b837132fe368b5f9ac716e1baf2d3401bb965806 (patch) | |
| tree | f0c3b385ce70678003f03734d41bed9866c3b41d | |
| parent | Disable -Werror for bug #205354. Remove old and drop to ~mips. (diff) | |
| download | gentoo-2-b837132fe368b5f9ac716e1baf2d3401bb965806.tar.gz gentoo-2-b837132fe368b5f9ac716e1baf2d3401bb965806.tar.bz2 gentoo-2-b837132fe368b5f9ac716e1baf2d3401bb965806.zip | |
Corrected install path. Fixes bug #242226, thanks to Kamil Kisiel <kamil@kamilkisiel.net> for reporting.
| -rw-r--r-- | eclass/embassy.eclass | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/eclass/embassy.eclass b/eclass/embassy.eclass index 2719b300a4b8..92c0659546a7 100644 --- a/eclass/embassy.eclass +++ b/eclass/embassy.eclass @@ -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/eclass/embassy.eclass,v 1.16 2008/02/15 01:22:32 ribosome Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/embassy.eclass,v 1.17 2008/11/03 22:17:50 ribosome Exp $ # Author Olivier Fisette <ribosome@gentoo.org> @@ -54,17 +54,25 @@ embassy_src_unpack() { } embassy_src_compile() { + local PREFIX="${ROOT}/usr" local EXTRA_CONF ! use X && EXTRA_CONF="${EXTRA_CONF} --without-x" ! use png && EXTRA_CONF="${EXTRA_CONF} --without-pngdriver" - ./configure --host=${CHOST} \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --datadir=/usr/share \ - --sysconfdir=/etc \ - --localstatedir=/var/lib \ - --libdir=/usr/$(get_libdir) \ - ${EXTRA_CONF} || die + ./configure \ + "--bindir=${PREFIX}/bin" \ + "--sbindir=${PREFIX}/sbin" \ + "--libexecdir=${PREFIX}/libexec" \ + "--sysconfdir=${ROOT}/etc" \ + "--sharedstatedir=${ROOT}/var" \ + "--localstatedir=${ROOT}/var" \ + "--libdir=${PREFIX}/$(get_libdir)" \ + "--includedir=${PREFIX}/include" \ + "--datarootdir=${PREFIX}/share" \ + "--datadir=${PREFIX}/share" \ + "--infodir=${PREFIX}/share/info" \ + "--localedir=${PREFIX}/share/locale" \ + "--mandir=${PREFIX}/share/man" \ + ${EXTRA_CONF} || die emake || die "Before reporting this error as a bug, please make sure you compiled EMBOSS and the EMBASSY packages with the same \"USE\" flags. Failure to do so may prevent the compilation of some EMBASSY packages, or cause @@ -76,6 +84,10 @@ embassy_src_compile() { embassy_src_install() { emake DESTDIR="${D}" install || die "Install failed" dodoc AUTHORS ChangeLog NEWS README + dodir /usr/share + mv "${D}"/usr/local/share/* "${D}"/usr/share/ + rmdir "${D}"/usr/local/share + rmdir "${D}"/usr/local } EXPORT_FUNCTIONS src_unpack src_compile src_install |