diff options
| author |   Benda XU <heroxbd@gentoo.org> | 2013-08-16 07:51:36 +0000 |
|---|---|---|
| committer | Benda XU <heroxbd@gentoo.org> | 2013-08-16 07:51:36 +0000 |
| commit | 4a1b51749572cfd4084521416cd42af2f1e65e31 (patch) | |
| tree | 0ec780798a2913a2aaa8fc7dfbe1f4d88200c5bc /eclass/wxwidgets.eclass | |
| parent | Bump (diff) | |
| download | gentoo-2-4a1b51749572cfd4084521416cd42af2f1e65e31.tar.gz gentoo-2-4a1b51749572cfd4084521416cd42af2f1e65e31.tar.bz2 gentoo-2-4a1b51749572cfd4084521416cd42af2f1e65e31.zip | |
Prefix support for wxwidgets, bug #481093
Diffstat (limited to 'eclass/wxwidgets.eclass')
| -rw-r--r-- | eclass/wxwidgets.eclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass index 1260835a4eec..82bbc14cbb93 100644 --- a/eclass/wxwidgets.eclass +++ b/eclass/wxwidgets.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/wxwidgets.eclass,v 1.32 2011/12/27 17:55:13 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/wxwidgets.eclass,v 1.33 2013/08/16 07:51:36 heroxbd Exp $ # @ECLASS: wxwidgets.eclass # @MAINTAINER: @@ -71,13 +71,13 @@ if [[ -z ${WX_CONFIG} ]]; then # newer versions don't have a seperate debug profile for wxdebug in xxx release- debug-; do wxconf="${wxtoolkit}-${wxchar}-${wxdebug/xxx/}${WX_GTK_VER}" - if [[ -f /usr/$(get_libdir)/wx/config/${wxconf} ]]; then + if [[ -f "${EPREFIX}"/usr/$(get_libdir)/wx/config/${wxconf} ]]; then # if this is a wxBase install, die in pkg_setup [[ ${wxtoolkit} == "base" ]] && WXBASE_DIE=1 else continue fi - WX_CONFIG="/usr/$(get_libdir)/wx/config/${wxconf}" + WX_CONFIG="${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf}" WX_ECLASS_CONFIG="${WX_CONFIG}" break done @@ -229,7 +229,7 @@ need-wxwidgets() { debug-print "wxconf is ${wxconf}" # if this doesn't work, something is seriously screwed - if [[ ! -f /usr/$(get_libdir)/wx/config/${wxconf} ]]; then + if [[ ! -f "${EPREFIX}"/usr/$(get_libdir)/wx/config/${wxconf} ]]; then echo eerror "Failed to find configuration ${wxconf}" echo @@ -238,7 +238,7 @@ need-wxwidgets() { debug-print "Found config ${wxconf} - setting WX_CONFIG" - export WX_CONFIG="/usr/$(get_libdir)/wx/config/${wxconf}" + export WX_CONFIG=""${EPREFIX}"/usr/$(get_libdir)/wx/config/${wxconf}" debug-print "WX_CONFIG is ${WX_CONFIG}" |