From bd49f4325a28e93359b8a47e49d4838aa6e8645b Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Mon, 15 Dec 2003 22:55:46 +0000
Subject: [PATCH] Add xext build, and fix x11 stage target.

BKrev: 3fde3bf29sHGOHqfWTU_DnoEFSCP3A
---
 x11/x11-cvs.oe   | 27 ++++++++++++---------------
 xau/xau-cvs.oe   |  2 --
 xext/xext-cvs.oe |  0
 3 files changed, 12 insertions(+), 17 deletions(-)
 create mode 100644 xext/xext-cvs.oe

diff --git a/x11/x11-cvs.oe b/x11/x11-cvs.oe
index 8d7fa3c007..5133768255 100644
--- a/x11/x11-cvs.oe
+++ b/x11/x11-cvs.oe
@@ -19,23 +19,20 @@ do_compile() {
 }
 
 do_stage() {
-
-	install -c -m 644 X11/XKBlib.h ${STAGING_DIR}/target/include/X11/XKBlib.h
-	install -c -m 644 X11/Xcms.h ${STAGING_DIR}/target/include/X11/Xcms.h
-	install -c -m 644 X11/Xlib.h ${STAGING_DIR}/target/include/X11/Xlib.h
-	install -c -m 644 X11/Xlibint.h ${STAGING_DIR}/target/include/X11/Xlibint.h
-	install -c -m 644 X11/Xlocale.h ${STAGING_DIR}/target/include/X11/Xlocale.h
-	install -c -m 644 X11/Xresource.h ${STAGING_DIR}/target/include/X11/Xresource.h
-	install -c -m 644 X11/Xutil.h ${STAGING_DIR}/target/include/X11/Xutil.h
-	install -c -m 644 X11/cursorfont.h ${STAGING_DIR}/target/include/X11/cursorfont.h
-	install -c -m 644 X11/region.h ${STAGING_DIR}/target/include/X11/region.h
-	install -c -m 644 X11/ImUtil.h ${STAGING_DIR}/target/include/X11/ImUtil.h
+	install -c -m 644 include/X11/XKBlib.h ${STAGING_INCDIR}/X11/XKBlib.h
+	install -c -m 644 include/X11/Xcms.h ${STAGING_INCDIR}/X11/Xcms.h
+	install -c -m 644 include/X11/Xlib.h ${STAGING_INCDIR}/X11/Xlib.h
+	install -c -m 644 include/X11/Xlibint.h ${STAGING_INCDIR}/X11/Xlibint.h
+	install -c -m 644 include/X11/Xlocale.h ${STAGING_INCDIR}/X11/Xlocale.h
+	install -c -m 644 include/X11/Xresource.h ${STAGING_INCDIR}/X11/Xresource.h
+	install -c -m 644 include/X11/Xutil.h ${STAGING_INCDIR}/X11/Xutil.h
+	install -c -m 644 include/X11/cursorfont.h ${STAGING_INCDIR}/X11/cursorfont.h
+	install -c -m 644 include/X11/region.h ${STAGING_INCDIR}/X11/region.h
+	install -c -m 644 include/X11/ImUtil.h ${STAGING_INCDIR}/X11/ImUtil.h
 	
-	install -c .libs/libX11.so.6.2.1 ${STAGING_DIR}/target/lib/libX11.so.6.2.1
+	install -c src/.libs/libX11.so.6.2.1 ${STAGING_DIR}/target/lib/libX11.so.6.2.1
 	ln -sf libX11.so.6.2.1 ${STAGING_LIBDIR}/libX11.so.6
 	ln -sf libX11.so.6.2.1 ${STAGING_LIBDIR}/libX11.so
 
-	install -c -m 644 .libs/libX11.a ${STAGING_DIR}/target/lib/libX11.a
-
-
+	install -c -m 644 src/.libs/libX11.a ${STAGING_DIR}/target/lib/libX11.a
 }
diff --git a/xau/xau-cvs.oe b/xau/xau-cvs.oe
index 8b586067e0..c90d3c2981 100644
--- a/xau/xau-cvs.oe
+++ b/xau/xau-cvs.oe
@@ -9,8 +9,6 @@ S=${WORKDIR}/Xau
 
 inherit autotools pkgconfig libtool
 
-EXTRA_OEMAKE="LIBTOOL=${STAGING_BINDIR}/libtool"
-
 do_stage () {
 	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_DIR}/target/include libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
 }
diff --git a/xext/xext-cvs.oe b/xext/xext-cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
-- 
2.39.5