Get rid of all references to the bootstrap script since it was removed

[synfig.git] / synfig-core / trunk / macosxbuild.sh

diff --git a/synfig-core/trunk/macosxbuild.sh b/synfig-core/trunk/macosxbuild.sh
index 3191e61..702ce31 100755 (executable)
--- a/synfig-core/trunk/macosxbuild.sh
+++ b/synfig-core/trunk/macosxbuild.sh
@@ -2,11 +2,10 @@
 
 #OPTIONS="--disable-optimization --enable-debug"
 
-PREFIX=/Applications/SynfigStudio.app/Contents/synfig
+PREFIX=/Users/darco/Projects/Voria/synfig-build
 
 export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig:/usr/lib/pkgconfig:/usr/X11R6/lib/pkgconfig
 OPTIONS="--prefix=$PREFIX"
-#OPTIONS="$OPTIONS --enable-timelimit=120"
 #OPTIONS="$OPTIONS --enable-optimization=2"
 OPTIONS="$OPTIONS --enable-optimization=3"
 #OPTIONS="$OPTIONS --enable-g5opt"
@@ -18,7 +17,7 @@ OPTIONS="$OPTIONS --disable-dependency-tracking"
 #OPTIONS="$OPTIONS --enable-universal"
 
 ARCH_FLAGS=""
-ARCH_FLAGS="$ARCH_FLAGS -arch ppc"
+#ARCH_FLAGS="$ARCH_FLAGS -arch ppc"
 ARCH_FLAGS="$ARCH_FLAGS -arch i386"
 
 LDFLAGS="-L$PREFIX/lib"
@@ -38,7 +37,7 @@ CXXCPP="g++ -E"
 
 BUILDDIR=macosxbuild
 
-[ -e configure ] || ./bootstrap || exit 1
+[ -e configure ] || ( libtoolize --ltdl --copy --force && autoreconf --force --install ) || exit 1
 
 [ -d $BUILDDIR ] && rm -fr $BUILDDIR
 
@@ -46,11 +45,11 @@ mkdir $BUILDDIR
 
 cd $BUILDDIR
 
-echo ../configure $OPTIONS CC="$CC" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS"
+echo ../configure $OPTIONS CC=\"$CC\" CXX=\"$CXX\" CPP=\"$CPP\" CXXCPP=\"$CXXCPP\" LDFLAGS=\"$LDFLAGS\" CFLAGS=\"$CFLAGS\" CXXFLAGS=\"$CXXFLAGS\"
 
 ../configure $OPTIONS CC="$CC" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" MACOS_DEPLOYMENT_TARGET=10.4 || exit 1
 
-make
+make -j2
 make install-strip
 
 #make package $MAKEFLAGS