X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fbootstrap;h=de408c8c94428fc34936288d108a14042213f577;hb=325d4a2d185802440c68e5c1d74f014426cac2d7;hp=85fb254aee7515fe36b448d4cca726a20a4676cb;hpb=18f426c62a55555033ed25ae1b0037638b18553f;p=synfig.git

diff --git a/synfig-core/trunk/bootstrap b/synfig-core/trunk/bootstrap
index 85fb254..de408c8 100755
--- 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
@@ -33,6 +37,7 @@ s/@PACKAGE_NAME@/$PACKAGE_NAME/g;
 s/@PACKAGE_BUGREPORT@/$PACKAGE_BUGREPORT/g;
 s/@PACKAGE_TARNAME@/$PACKAGE_TARNAME/g;
 s/@PACKAGE_VERSION@/$PACKAGE_VERSION/g;
+s|@SVN_REPOSITORY@|$SVN_REPOSITORY|g;
 s/@VERSION@/$VERSION/g;
 s/@API_VERSION@/$API_VERSION/g;
 s/@VERSION_MAJ@/$VERSION_MAJ/g;
@@ -218,8 +223,8 @@ set +x
 (
 output Patching libtool...
 patch config/ltmain.sh config/ltmain.patch
-) ||
-{
+) || true
+false && {
 	# Something went wrong...
 	set +x
 	output Failure.
@@ -306,3 +311,5 @@ cleanup;
 
 # Move back to the current directory
 cd $CURR_DIR
+
+make -C src/synfig/proto