summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2012-12-09 16:02:37 +0000
committerFabian Groffen <grobian@gentoo.org>2012-12-09 16:02:37 +0000
commit0228f781c0e9d0b810eac25bcac1e61889eea810 (patch)
tree3bde03cfad29678cf208b2cf1eef37538ba5fa61 /sys-apps
parentDrop no longer working BINHOST, and confusing comment (diff)
downloadgentoo-2-0228f781c0e9d0b810eac25bcac1e61889eea810.tar.gz
gentoo-2-0228f781c0e9d0b810eac25bcac1e61889eea810.tar.bz2
gentoo-2-0228f781c0e9d0b810eac25bcac1e61889eea810.zip
Fix install for Prefix, bug #446568
(Portage version: 2.2.01.21418-prefix/cvs/Darwin i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/hwids/ChangeLog6
-rw-r--r--sys-apps/hwids/hwids-20121208.5.ebuild8
-rw-r--r--sys-apps/hwids/hwids-99999999.ebuild8
3 files changed, 13 insertions, 9 deletions
diff --git a/sys-apps/hwids/ChangeLog b/sys-apps/hwids/ChangeLog
index 9b89fb631c85..927123da85de 100644
--- a/sys-apps/hwids/ChangeLog
+++ b/sys-apps/hwids/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/hwids
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/ChangeLog,v 1.52 2012/12/08 11:54:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/ChangeLog,v 1.53 2012/12/09 16:02:37 grobian Exp $
+
+ 09 Dec 2012; Fabian Groffen <grobian@gentoo.org> hwids-20121208.5.ebuild,
+ hwids-99999999.ebuild:
+ Fix install for Prefix, bug #446568
*hwids-20121208.5 (08 Dec 2012)
diff --git a/sys-apps/hwids/hwids-20121208.5.ebuild b/sys-apps/hwids/hwids-20121208.5.ebuild
index 9af5ded8b3f7..6206d8070d88 100644
--- a/sys-apps/hwids/hwids-20121208.5.ebuild
+++ b/sys-apps/hwids/hwids-20121208.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-20121208.5.ebuild,v 1.1 2012/12/08 11:54:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-20121208.5.ebuild,v 1.2 2012/12/09 16:02:37 grobian Exp $
EAPI=5
inherit udev
@@ -22,9 +22,9 @@ S=${WORKDIR}/hwids-${P}
src_configure() {
MAKEOPTS+=" UDEV=$(usex udev)"
- MAKEOPTS+=" DOCDIR=/usr/share/doc/${PF}"
- MAKEOPTS+=" MISCDIR=/usr/share/misc"
- MAKEOPTS+=" HWDBDIR=$(udev_get_udevdir)/hwdb.d"
+ MAKEOPTS+=" DOCDIR=${EPREFIX}/usr/share/doc/${PF}"
+ MAKEOPTS+=" MISCDIR=${EPREFIX}/usr/share/misc"
+ MAKEOPTS+=" HWDBDIR=${EPREFIX}$(udev_get_udevdir)/hwdb.d"
MAKEOPTS+=" DESTDIR=${D}"
}
diff --git a/sys-apps/hwids/hwids-99999999.ebuild b/sys-apps/hwids/hwids-99999999.ebuild
index 5af37e3f1e1c..dd8b9e8c8f3e 100644
--- a/sys-apps/hwids/hwids-99999999.ebuild
+++ b/sys-apps/hwids/hwids-99999999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-99999999.ebuild,v 1.12 2012/12/08 11:54:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-99999999.ebuild,v 1.13 2012/12/09 16:02:37 grobian Exp $
EAPI=5
inherit udev git-2
@@ -25,9 +25,9 @@ src_prepare() {
src_configure() {
MAKEOPTS+=" UDEV=$(usex udev)"
- MAKEOPTS+=" DOCDIR=/usr/share/doc/${PF}"
- MAKEOPTS+=" MISCDIR=/usr/share/misc"
- MAKEOPTS+=" HWDBDIR=$(udev_get_udevdir)/hwdb.d"
+ MAKEOPTS+=" DOCDIR=${EPREFIX}/usr/share/doc/${PF}"
+ MAKEOPTS+=" MISCDIR=${EPREFIX}/usr/share/misc"
+ MAKEOPTS+=" HWDBDIR=${EPREFIX}$(udev_get_udevdir)/hwdb.d"
MAKEOPTS+=" DESTDIR=${D}"
}