Stabe Tag: Removing old tag

[synfig.git] / synfig-core / trunk / bootstrap

diff --git a/synfig-core/trunk/bootstrap b/synfig-core/trunk/bootstrap
index 85fb254..3d7759b 100755 (executable)
--- a/synfig-core/trunk/bootstrap
+++ b/synfig-core/trunk/bootstrap
@@ -9,13 +9,17 @@
 #
 
 # Grab the current directory and move to our own
-CURR_DIR=$(pwd)
-cd $(dirname $0)
+CURR_DIR="$(pwd)"
+cd "$(dirname $0)"
 
 # Environment Variables
-BOOTSTRAP_NAME=$(basename $0)
-CONFIG_DIR=$(pwd)/config
+BOOTSTRAP_NAME="$(basename $0)"
+CONFIG_DIR="$(pwd)/config"
 
+[ -x /bin/cygpath ] && CONFIG_DIR="`cygpath -m -s "$CONFIG_DIR"`"
+[ -x /bin/cygpath ] && CONFIG_DIR="`cygpath -u "$CONFIG_DIR"`"
+[ -x /bin/cygpath ] && CURR_DIR="`cygpath -m -s "$CURR_DIR"`"
+[ -x /bin/cygpath ] && CURR_DIR="`cygpath -u "$CURR_DIR"`"
 # Automake,Autoconf, and Libtool versions that we require
 #AUTOCONF_VERSION=2.5
 #AUTOMAKE_VERSION=1.6
@@ -218,8 +222,8 @@ set +x
 (
 output Patching libtool...
 patch config/ltmain.sh config/ltmain.patch
-) ||
-{
+) || true
+false && {
        # Something went wrong...
        set +x
        output Failure.
@@ -306,3 +310,5 @@ cleanup;
 
 # Move back to the current directory
 cd $CURR_DIR
+
+make -C src/synfig/proto