From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 6 Mar 2008 00:31:53 +0000 (+0000)
Subject: libx11 1.1.2|1.1.3 repair (merge with poky broke it)
X-Git-Tag: Release-2010-05/1~7557^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e88593b8cd69fe3146a43ffec9946f22bb6462f;p=openembedded.git

libx11 1.1.2|1.1.3 repair (merge with poky broke it)
---

diff --git a/packages/xorg-lib/libx11_1.1.2.bb b/packages/xorg-lib/libx11_1.1.2.bb
index 58f5b82419..5243de4259 100644
--- a/packages/xorg-lib/libx11_1.1.2.bb
+++ b/packages/xorg-lib/libx11_1.1.2.bb
@@ -17,8 +17,6 @@ do_compile() {
 	(
 		unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
 		cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
-		# mv to stop it getting rebuilt
-		mv makekeys.c makekeys.c.orig
 		cd ../../
 	) || exit 1
 	oe_runmake
diff --git a/packages/xorg-lib/libx11_1.1.3.bb b/packages/xorg-lib/libx11_1.1.3.bb
index 58f5b82419..5243de4259 100644
--- a/packages/xorg-lib/libx11_1.1.3.bb
+++ b/packages/xorg-lib/libx11_1.1.3.bb
@@ -17,8 +17,6 @@ do_compile() {
 	(
 		unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
 		cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
-		# mv to stop it getting rebuilt
-		mv makekeys.c makekeys.c.orig
 		cd ../../
 	) || exit 1
 	oe_runmake