mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildx.sh: use "mkdir -p" to create $PREFIX_DIR, don't retry

Browse Source 
Improve messages about $PREFIX_DIR
This commit is contained in:
Pavel Roskin 2016-10-08 02:02:07 +00:00
parent 132cc10f75
commit 22c370a6a1
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
xorg/X11R7.6/buildx.sh
View File

@ -218,37 +218,28 @@ else
export PREFIX_DIR=$1
fi
if ! test -d $PREFIX_DIR; then
echo "dir does not exist, creating [$PREFIX_DIR]"
if ! mkdir $PREFIX_DIR
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 LDFLAGS=-Wl,-rpath=$PREFIX_DIR/lib
export CFLAGS="-I$PREFIX_DIR/include -fPIC -O2"
# prefix dir must exist...
if [ ! -d $PREFIX_DIR ]; then
if ! mkdir -p $PREFIX_DIR
then
echo "$PREFIX_DIR does not exist; failed to create it - cannot continue"
echo "$PREFIX_DIR does not exist, creating it"
if ! mkdir -p $PREFIX_DIR; then
echo "$PREFIX_DIR cannot be created - cannot continue"
exit 1
fi
fi
# ...and be writable
if [ ! -w $PREFIX_DIR ]; then
echo "directory $PREFIX_DIR is not writable - cannot continue"
echo "$PREFIX_DIR is not writable - cannot continue"
exit 1
fi
echo "installation directory: $PREFIX_DIR"
export PKG_CONFIG_PATH=$PREFIX_DIR/lib/pkgconfig:$PREFIX_DIR/share/pkgconfig
export PATH=$PREFIX_DIR/bin:$PATH
export LDFLAGS=-Wl,-rpath=$PREFIX_DIR/lib
export CFLAGS="-I$PREFIX_DIR/include -fPIC -O2"
# create a downloads dir
if [ ! -d downloads ]; then
if ! mkdir downloads