From 0fcae2fa3d328a2f6750da21a62f14dc7c8aaf7f Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@dv9000.openelec.tv>
Date: Thu, 16 Apr 2009 22:55:28 +0200
Subject: [PATCH] various fixes

---
 config/path                        |  5 +++--
 packages/x11/other/openbox/install | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/config/path b/config/path
index 05e9635cf3..9278d108ad 100644
--- a/config/path
+++ b/config/path
@@ -203,5 +203,6 @@ require_cxx() {
 INCLUDED_LANGS="en $MENU_LANG $INCLUDED_LANGS"
 
 # read personal options if available
-test -f "$PROJECT_DIR/options" \
-  && . "$PROJECT_DIR/options"
+if [ -f $PROJECT_DIR/options ]; then
+. $PROJECT_DIR/options
+fi
diff --git a/packages/x11/other/openbox/install b/packages/x11/other/openbox/install
index c742ddcb17..53bb2ff88f 100755
--- a/packages/x11/other/openbox/install
+++ b/packages/x11/other/openbox/install
@@ -10,18 +10,18 @@ $SCRIPTS/install libxml2
 PKG_DIR=`find $PACKAGES -type d -name $1`
 
 mkdir -p $INSTALL/usr/bin
-cp $BUILD/$1*/$1/.libs/$1 $INSTALL/usr/bin
+cp -PR $BUILD/$1*/$1/.libs/$1 $INSTALL/usr/bin
 
 mkdir -p $INSTALL/usr/lib
-cp $BUILD/$1*/parser/.libs/*.so* $INSTALL/usr/lib
-cp $BUILD/$1*/render/.libs/*.so* $INSTALL/usr/lib
-rm -rf $INSTALL/usr/lib/libobrender.*T
+cp -PR $BUILD/$1*/parser/.libs/*.so* $INSTALL/usr/lib
+cp -PR $BUILD/$1*/render/.libs/*.so* $INSTALL/usr/lib
+rm -rf $INSTALL/usr/lib/*.so*T
 
 mkdir -p $INSTALL/usr/share/themes
 cp -RP $BUILD/$1*/themes/Clearlooks $INSTALL/usr/share/themes
 
 mkdir -p $INSTALL/etc/xdg/openbox
-cp -RP $PKG_DIR/config/rc.xml $INSTALL/etc/xdg/openbox
+cp -PR $PKG_DIR/config/rc.xml $INSTALL/etc/xdg/openbox
 
 mkdir -p $INSTALL/etc/X11/xinit/xinitrc.d
 cp -PR $PKG_DIR/scripts/xinitrc.d/* $INSTALL/etc/X11/xinit/xinitrc.d