From a953836f2e007e37df2094368069e87cefa73092 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Fri, 3 Oct 2008 10:02:16 +0000
Subject: libxt: Use STAGING_INCDIR_NATIVE, not STAGING_INCDIR. Also fix error
 handling.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5406 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/xorg-lib/libxt_1.0.5.bb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'meta/packages/xorg-lib')

diff --git a/meta/packages/xorg-lib/libxt_1.0.5.bb b/meta/packages/xorg-lib/libxt_1.0.5.bb
index 80c7bf17b..504779933 100644
--- a/meta/packages/xorg-lib/libxt_1.0.5.bb
+++ b/meta/packages/xorg-lib/libxt_1.0.5.bb
@@ -12,8 +12,11 @@ EXTRA_OECONF += "--disable-install-makestrs --disable-xkb"
 
 do_compile() {
 	(
-		unset CC LD CXX CCLD
-		oe_runmake -C util 'XT_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE -I${STAGING_INCDIR} ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs
-	) || exit 1
+		unset CC LD CXX CCLD CFLAGS
+		oe_runmake -C util 'XT_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE -I${STAGING_INCDIR_NATIVE} ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs
+	)
+	if [ "$?" != "0" ]; then
+		exit 1
+	fi
 	oe_runmake
 }
-- 
cgit v1.2.3