Make macbuild-lipo more robust, add lipo-dir which will lipo two dirs (one a ppc install and one an intel install) together.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

distrib/scripts/mac/macbuild

@@ -2,7 +2,8 @@
 
 # you need to change this if you run from outside this dir. 
 if [ "$WXROOT" = "" ]; then
-  WXROOT=../../..
+  scriptDir="$(cd $(dirname $0);pwd)"
+  WXROOT=$scriptDir/../../..
 fi
 
 . $WXROOT/distrib/scripts/includes/configure_build.inc
@@ -13,16 +14,18 @@ fi
 # configure-based build scripts, which is why this looks a little empty.
 
 if [ "$UNIVERSAL" = "1" ]; then
-  OTHER_OPTS="--enable-universal_binary "
+  OTHER_OPTS="$OTHER_OPTS --enable-universal_binary --with-libjpeg=builtin --with-libpng=builtin"
 fi
 
+mkdir -p builds
+cd builds
 do_build
 
 make prefix=$INSTALLDIR install
 
 if [ "$WXPYTHON" == "1" ]; then
-  make -C contrib/src/gizmos prefix=$INSTALLDIR install
-  make -C contrib/src/stc prefix=$INSTALLDIR install
-fi
+    make -C contrib/src/gizmos prefix=$INSTALLDIR install
+    make -C contrib/src/stc prefix=$INSTALLDIR install
+fi 
 
 cd $OLDDIR