| 1 |
abcd 11/03/01 23:02:08 |
| 2 |
|
| 3 |
Modified: waf-utils.eclass |
| 4 |
Log: |
| 5 |
Fix prefix support |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.5 eclass/waf-utils.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?rev=1.5&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?rev=1.5&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?r1=1.4&r2=1.5 |
| 13 |
|
| 14 |
Index: waf-utils.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v |
| 17 |
retrieving revision 1.4 |
| 18 |
retrieving revision 1.5 |
| 19 |
diff -u -r1.4 -r1.5 |
| 20 |
--- waf-utils.eclass 24 Jan 2011 14:04:39 -0000 1.4 |
| 21 |
+++ waf-utils.eclass 1 Mar 2011 23:02:08 -0000 1.5 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2010 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.4 2011/01/24 14:04:39 scarabeus Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.5 2011/03/01 23:02:08 abcd Exp $ |
| 27 |
|
| 28 |
# @ECLASS: waf-utils.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -9,6 +9,7 @@ |
| 31 |
# @CODE |
| 32 |
# Original Author: Gilles Dartiguelongue <eva@g.o> |
| 33 |
# Various improvements based on cmake-utils.eclass: Tomáš Chvátal <scarabeus@g.o> |
| 34 |
+# Proper prefix support: Jonathan Callen <abcd@g.o> |
| 35 |
# @CODE |
| 36 |
# @BLURB: common ebuild functions for waf-based packages |
| 37 |
# @DESCRIPTION: |
| 38 |
@@ -34,12 +35,12 @@ |
| 39 |
# Eclass can use different waf executable. Usually it is located in "${S}/waf". |
| 40 |
: ${WAF_BINARY:="${S}/waf"} |
| 41 |
|
| 42 |
- echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=/usr --libdir=/usr/$(get_libdir) $@ configure" |
| 43 |
+ echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr --libdir=${EPREFIX}/usr/$(get_libdir) $@ configure" |
| 44 |
|
| 45 |
CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \ |
| 46 |
- --prefix=/usr \ |
| 47 |
- --libdir=/usr/$(get_libdir) \ |
| 48 |
- $@ \ |
| 49 |
+ "--prefix=${EPREFIX}/usr" \ |
| 50 |
+ "--libdir=${EPREFIX}/usr/$(get_libdir)" \ |
| 51 |
+ "$@" \ |
| 52 |
configure || die "configure failed" |
| 53 |
} |
| 54 |
|
| 55 |
@@ -60,8 +61,8 @@ |
| 56 |
waf-utils_src_install() { |
| 57 |
debug-print-function ${FUNCNAME} "$@" |
| 58 |
|
| 59 |
- echo "\"${WAF_BINARY}\" --destdir=\"${ED}\" install" |
| 60 |
- "${WAF_BINARY}" --destdir="${ED}" install || die "Make install failed" |
| 61 |
+ echo "\"${WAF_BINARY}\" --destdir=\"${D}\" install" |
| 62 |
+ "${WAF_BINARY}" --destdir="${D}" install || die "Make install failed" |
| 63 |
|
| 64 |
# Manual document installation |
| 65 |
base_src_install_docs |
Archives