From 88b437dc03448bd2a51c820cb6dab21973b29a3b Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 29 Jan 2013 02:42:55 +0100
Subject: [PATCH] libX11: mostly cosmetics, we dont do install from
 $SYSROOT_PREFIX :-)

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/lib/libX11/build   | 4 +++-
 packages/x11/lib/libX11/install | 9 +++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/x11/lib/libX11/build b/packages/x11/lib/libX11/build
index 2a58cbfe35..a31fde42f2 100755
--- a/packages/x11/lib/libX11/build
+++ b/packages/x11/lib/libX11/build
@@ -28,7 +28,6 @@ export CFLAGS_FOR_BUILD="$HOST_CFLAGS"
 export LDFLAGS_FOR_BUILD="$HOST_LDFLAGS"
 
 cd $PKG_BUILD
-
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
@@ -41,6 +40,7 @@ cd $PKG_BUILD
             --enable-xthreads \
             --disable-xcms \
             --enable-xlocale \
+            --disable-xlocaledir \
             --enable-xkb \
             --disable-xf86bigfont \
             --enable-malloc0returnsnull \
@@ -54,5 +54,7 @@ cd $PKG_BUILD
             --without-lint
 
 make
+make -C nls DESTDIR=`pwd`/.install install
 
 $MAKEINSTALL
+
diff --git a/packages/x11/lib/libX11/install b/packages/x11/lib/libX11/install
index 7ee76b37a2..fb944d100e 100755
--- a/packages/x11/lib/libX11/install
+++ b/packages/x11/lib/libX11/install
@@ -26,8 +26,9 @@ mkdir -p $INSTALL/usr/lib
   cp -P $PKG_BUILD/src/.libs/libX11*.so* $INSTALL/usr/lib
   rm -rf $INSTALL/usr/lib/libX11*.so*T
 
-mkdir -p $INSTALL/usr/share/X11
-  cp -R $SYSROOT_PREFIX/usr/share/X11/locale $INSTALL/usr/share/X11
+mkdir -p $INSTALL
+  cp -R $PKG_BUILD/.install/* $INSTALL
 
-mkdir -p $INSTALL/usr/lib/X11
-  cp -R $SYSROOT_PREFIX/usr/lib/X11/locale $INSTALL/usr/lib/X11
+mkdir -p $INSTALL/usr/lib/X11/locale/common
+  cp -R $PKG_BUILD/modules/*/*/.libs/*.so* $INSTALL/usr/lib/X11/locale/common
+  rm -rf $INSTALL/usr/lib/X11/locale/common/*.so.*T
\ No newline at end of file