From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 28 Aug 2015 17:37:40 +0000 (-0400)
Subject: sys-libs/ncurses: fix cross tic path test #558622
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=91e515ab11805360a4d8a69bc5e0dbeba189984d;p=gentoo.git

sys-libs/ncurses: fix cross tic path test #558622
---

diff --git a/sys-libs/ncurses/ncurses-5.9-r101.ebuild b/sys-libs/ncurses/ncurses-5.9-r101.ebuild
index 00166f61aca9..a90cf859b8d1 100644
--- a/sys-libs/ncurses/ncurses-5.9-r101.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-r101.ebuild
@@ -146,8 +146,8 @@ do_configure() {
 	fi
 	# See comments in src_configure.
 	if [[ ${target} != "cross" ]] ; then
-		local tic_path="${WORKDIR}/cross/progs/tic"
-		[[ -d ${tic_path} ]] && export TIC_PATH=${tic_path}
+		local cross_path="${WORKDIR}/cross"
+		[[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic"
 	else
 		conf+=( --with-progs )
 	fi
diff --git a/sys-libs/ncurses/ncurses-6.0-r1.ebuild b/sys-libs/ncurses/ncurses-6.0-r1.ebuild
index a8b1c1e68640..977da6d83348 100644
--- a/sys-libs/ncurses/ncurses-6.0-r1.ebuild
+++ b/sys-libs/ncurses/ncurses-6.0-r1.ebuild
@@ -159,8 +159,8 @@ do_configure() {
 	fi
 	# See comments in src_configure.
 	if [[ ${target} != "cross" ]] ; then
-		local tic_path="${WORKDIR}/cross/progs/tic"
-		[[ -d ${tic_path} ]] && export TIC_PATH=${tic_path}
+		local cross_path="${WORKDIR}/cross"
+		[[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic"
 	fi
 
 	# Force bash until upstream rebuilds the configure script with a newer