X-Git-Url: http://gitweb/?a=blobdiff_plain;f=pkgmk-cross;h=888bf02dc705d1dba26cdad8748017867a0ba386;hb=refs%2Fheads%2F3.3;hp=49d0065e83c031a72ba17fc5e747f6ea83efae26;hpb=ab4e8070fd71abf676518a2e5fddee35095b6cd2;p=pkgutils-cross.git

diff --git a/pkgmk-cross b/pkgmk-cross
index 49d0065..888bf02 100755
--- a/pkgmk-cross
+++ b/pkgmk-cross
@@ -3,8 +3,8 @@
 TOPDIR="$(cd $(dirname $(which $0)); pwd)"
 TMP_CONF="$(mktemp)"
 
-PKGMK=$TOPDIR/src/pkgmk
-PKGMK_CONF=$TOPDIR/src/pkgmk.conf
+PKGMK=$TOPDIR/pkgmk
+PKGMK_CONF=$TOPDIR/pkgmk-cross.conf
 PKGMK_ARGS=""
 PKGMK_OPTIMIZE=""
 
@@ -19,7 +19,7 @@ while [ "$1" ]; do
 done
 
 if [ ! -z "$PKGMK_OPTIMIZE" ]; then
-	_cflags="$(grep "^${PKGMK_OPTIMIZE}_CFLAGS=" $PKGMK_CONF | cut -d'=' -f2- | sed 's|"||g')"
+  _cflags="$(grep "^${PKGMK_OPTIMIZE}_CFLAGS=" $PKGMK_CONF | cut -d'=' -f2- | sed 's|"||g')"
   if [ ! -z "$_cflags" ]; then
     sed '/_CFLAGS=/d' $PKGMK_CONF | sed "s|CFLAGS=.*|CFLAGS=\"$_cflags\"|" > $TMP_CONF
     PKGMK_CONF="$TMP_CONF"
@@ -29,8 +29,16 @@ if [ ! -z "$PKGMK_OPTIMIZE" ]; then
   fi
 fi
 
+if [ ! -x $PKGMK ]; then
+  chmod +x $PKGMK
+fi
+
 $PKGMK -cf $PKGMK_CONF $PKGMK_ARGS
+exit_code=$?
 
 rm -f $TMP_CONF
 
+# Pass along the exit code of pkgmk.
+exit $exit_code
+
 # End of file