From 03b8ad837500f366f693ba18c073905fe3b24634 Mon Sep 17 00:00:00 2001 From: Benda XU Date: Mon, 4 Feb 2013 01:50:56 +0000 Subject: fix Prefix library location in configure. bug 394123 (Portage version: 2.1.11.34/cvs/Linux x86_64, unsigned Manifest commit) --- x11-libs/wxGTK/ChangeLog | 7 +++++-- x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild | 9 +++++---- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'x11-libs/wxGTK') diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog index b3992bad3c83..41530f1bd015 100644 --- a/x11-libs/wxGTK/ChangeLog +++ b/x11-libs/wxGTK/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/wxGTK -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.297 2012/11/23 04:53:30 zerochaos Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.298 2013/02/04 01:50:56 heroxbd Exp $ + + 04 Feb 2013; Benda Xu wxGTK-2.8.12.1.ebuild: + fix Prefix library location in configure. bug 394123 23 Nov 2012; Rick Farina wxGTK-2.8.12.1.ebuild, wxGTK-2.9.3.1.ebuild, wxGTK-2.9.4.1.ebuild: diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild index d42e6887b80b..540c2f1ccbe8 100644 --- a/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild +++ b/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild,v 1.14 2012/11/23 04:53:29 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild,v 1.15 2013/02/04 01:50:56 heroxbd Exp $ EAPI="4" @@ -72,8 +72,9 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch # Bug #174874 epatch "${FILESDIR}"/${PN}-2.8.10.1-odbc-defines.patch # Bug #310923 sed \ - -e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" \ - -i configure || die + -e "s:/usr:${EPREFIX}/usr:g" \ + -e '/SEARCH_INCLUDE="\\/,/"/cSEARCH_INCLUDE="'${EPREFIX}'/usr/include"' \ + -i configure || die "sed on configure failed" } src_configure() { -- cgit v1.2.3-65-gdbad