From 7be2e60b4b3dabbfe1fb8c7f95502227e7536573 Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Sun, 3 Nov 2013 00:28:01 +0200
Subject: [PATCH] ...

---
 android/android-dependencies.txt | 2 +-
 android/build.sh                 | 4 +++-
 configure-xsdl.sh                | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/android/android-dependencies.txt b/android/android-dependencies.txt
index 46afd7a48..6f04e232d 100644
--- a/android/android-dependencies.txt
+++ b/android/android-dependencies.txt
@@ -1 +1 @@
-libpixman-1-dev libxfont-dev libxkbfile-dev libpciaccess-dev xutils-dev xcb-proto python-xcbgen x11proto-*
+libpixman-1-dev libxfont-dev libxkbfile-dev libpciaccess-dev xutils-dev xcb-proto python-xcbgen xsltproc x11proto-*
diff --git a/android/build.sh b/android/build.sh
index ef7f17e56..7ffb3b7ab 100755
--- a/android/build.sh
+++ b/android/build.sh
@@ -579,6 +579,8 @@ ln -sf $BUILDDIR/../../../../../libs/armeabi-v7a/libsdl-1.2.so $BUILDDIR/libSDL.
 ln -sf $NDK/sources/android/libportable/libs/armeabi-v7a/libportable.a $BUILDDIR/libpthread.a # dummy
 ln -sf $NDK/sources/android/libportable/libs/armeabi-v7a/libportable.a $BUILDDIR/libts.a # dummy
 
+[ -z "$PACKAGE_NAME" ] && PACKAGE_NAME=X.org.server
+
 [ -e Makefile ] || \
 env CFLAGS=" \
 	-isystem$BUILDDIR \
@@ -593,7 +595,7 @@ LDFLAGS="-L$BUILDDIR" \
 LIBS="-lfontenc -lfreetype -llog" \
 ../configure \
 --host=arm-linux-androideabi \
---prefix=/usr \
+--prefix=/sdcard/Android/data/$PACKAGE_NAME/files/usr \
 --disable-xorg --disable-dmx --disable-xvfb --disable-xnest --disable-xquartz --disable-xwin \
 --disable-xephyr --disable-xfake --disable-xfbdev --disable-unit-tests --disable-tslib \
 --disable-shm --disable-mitshm --disable-dri --disable-dri2 --disable-glx --disable-xf86vidmode \
diff --git a/configure-xsdl.sh b/configure-xsdl.sh
index ffecc02cb..823deb102 100755
--- a/configure-xsdl.sh
+++ b/configure-xsdl.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 env SDL=yes CFLAGS="-O0 -g" \
-./configure --prefix=/usr \
+./configure --prefix=`pwd`/data/usr \
 --enable-debug \
 --disable-xorg --disable-dmx --disable-xvfb --disable-xnest --disable-xquartz --disable-xwin \
 --disable-xephyr --disable-xfake --disable-xfbdev --disable-unit-tests \