summaryrefslogtreecommitdiffstats
path: root/xorg/X11R7.6/buildx.sh
diff options
context:
space:
mode:
authorJay Sorg <jay.sorg@gmail.com>2012-02-01 23:21:56 -0800
committerJay Sorg <jay.sorg@gmail.com>2012-02-01 23:21:56 -0800
commit230ee6166fa874389839e75eafb0d0aad7d3efc7 (patch)
treeeed182379f09dfe9412490facdd884bb4fac2193 /xorg/X11R7.6/buildx.sh
parent84adf7a45c16b2b4704c84ae765100c02e6fc55c (diff)
downloadxrdp-proprietary-230ee6166fa874389839e75eafb0d0aad7d3efc7.tar.gz
xrdp-proprietary-230ee6166fa874389839e75eafb0d0aad7d3efc7.zip
added default parameter to buildx.sh
Diffstat (limited to 'xorg/X11R7.6/buildx.sh')
-rwxr-xr-xxorg/X11R7.6/buildx.sh21
1 files changed, 19 insertions, 2 deletions
diff --git a/xorg/X11R7.6/buildx.sh b/xorg/X11R7.6/buildx.sh
index 24f6eabc..deeae127 100755
--- a/xorg/X11R7.6/buildx.sh
+++ b/xorg/X11R7.6/buildx.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# build.sh: a script for building X11R7.6 X server for use with xrdp #
-# Copyright 2011 Jay Sorg Jay.Sorg@gmail.com
+# Copyright 2011-2012 Jay Sorg Jay.Sorg@gmail.com
#
# Authors
# Jay Sorg Jay.Sorg@gmail.com
@@ -247,6 +247,7 @@ if [ $# -lt 1 ]; then
echo ""
echo "usage: build.sh <installation dir>"
echo "usage: build.sh <clean>"
+ echo "usage: build.sh default"
echo ""
exit 1
fi
@@ -258,7 +259,23 @@ if [ "$1" = "clean" ]; then
exit 0
fi
-export PREFIX_DIR=$1
+if [ "$1" = "default" ]; then
+ export PREFIX_DIR=$PWD/staging
+else
+ export PREFIX_DIR=$1
+fi
+
+if ! test -d $PREFIX_DIR; then
+ echo "dir does not exit, creating [$PREFIX_DIR]"
+ mkdir $PREFIX_DIR
+ if ! test $? -eq 0; then
+ echo "mkdir failed [$PREFIX_DIR]"
+ exit 0
+ fi
+fi
+
+echo "using $PREFIX_DIR"
+
export PKG_CONFIG_PATH=$PREFIX_DIR/lib/pkgconfig:$PREFIX_DIR/share/pkgconfig
export PATH=$PREFIX_DIR/bin:$PATH
export LD_LIBRARY_PATH=$PREFIX_DIR/lib