X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fbootstrap;h=3be6501d3cc0e9baadfdb655354504552072df89;hb=0809ba8eb14cf885c8f197d751c80cced84d9676;hp=5050a2f5af4a89ee73393838e0e8f9a46baf9430;hpb=41be07ad311b19bfdd52aa87c4e4a334210e4c23;p=synfig.git diff --git a/synfig-studio/trunk/bootstrap b/synfig-studio/trunk/bootstrap index 5050a2f..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,18 +142,18 @@ 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-$VERSION.spec... -mv project.spec "$PACKAGE-$VERSION.spec" +output Renaming project.spec to $PACKAGE.spec... +mv project.spec "$PACKAGE.spec" -output Finishing up $PACKAGE-$VERSION.spec... -echo %changelog >> "$PACKAGE-$VERSION.spec" -cat ChangeLog >> "$PACKAGE-$VERSION.spec" +output Finishing up $PACKAGE.spec... +echo %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"