X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fbootstrap;h=3be6501d3cc0e9baadfdb655354504552072df89;hb=03f01861968a8235519f32608f8dcdf57baafbb1;hp=c4f02673785b5f83289a1fcd08370dbb336aeb46;hpb=263524301a209ceb5fbbf6bd1c4c0cbb73a7efb8;p=synfig.git diff --git a/synfig-studio/trunk/bootstrap b/synfig-studio/trunk/bootstrap index c4f0267..3be6501 100755 --- a/synfig-studio/trunk/bootstrap +++ b/synfig-studio/trunk/bootstrap @@ -14,9 +14,9 @@ cd $(dirname $0) # Environment Variables BOOTSTRAP_NAME=$(basename $0) -CONFIG_DIR=$(pwd)/config +CONFIG_DIR="config" -. $CONFIG_DIR/build.cfg +. "$CONFIG_DIR/build.cfg" SED_SCRIPT=" s/@PACKAGE@/$PACKAGE/g; @@ -142,7 +142,7 @@ mv $TEMPFILE aclocal.m4 for FILENAME in project.spec ; do { output Creating $FILENAME... -sed "$SED_SCRIPT" < $CONFIG_DIR/$FILENAME.in > $FILENAME; +sed "$SED_SCRIPT" < "$CONFIG_DIR/$FILENAME.in" > "$FILENAME"; } ; done output Renaming project.spec to $PACKAGE.spec... @@ -150,10 +150,10 @@ mv project.spec "$PACKAGE.spec" output Finishing up $PACKAGE.spec... echo %changelog >> "$PACKAGE.spec" -cat ChangeLog >> "$PACKAGE.spec" +cat NEWS >> "$PACKAGE.spec" output Creating configure.in from configure.ac... -sed "$SED_SCRIPT" < $CONFIG_DIR/configure.ac > configure.in; +sed "$SED_SCRIPT" < "$CONFIG_DIR/configure.ac" > configure.in; output Setting up build environment... @@ -164,7 +164,7 @@ set -x ( # $INTLTOOLIZE -c && $LIBTOOLIZE -c -f && - $ACLOCAL -I $CONFIG_DIR $ACLOCAL_FLAGS && + $ACLOCAL -I "$CONFIG_DIR" $ACLOCAL_FLAGS && aclocalfix && $AUTOHEADER && $AUTOMAKE --foreign --add-missing --copy --include-deps && @@ -250,4 +250,4 @@ echo $BOOTSTRAP_NAME: Complete. cleanup; # Move back to the current directory -cd $CURR_DIR +cd "$CURR_DIR"