projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Partially fix 1678554: fix the font colour and size in the about dialog, inspiration...
[synfig.git]
/
synfig-core
/
trunk
/
bootstrap
diff --git
a/synfig-core/trunk/bootstrap
b/synfig-core/trunk/bootstrap
index
de408c8
..
f2398d2
100755
(executable)
--- a/
synfig-core/trunk/bootstrap
+++ b/
synfig-core/trunk/bootstrap
@@
-1,7
+1,7
@@
#! /bin/sh
#
#! /bin/sh
#
-# S
inf
g Bootstrap Script
-# $Id
: bootstrap,v 1.2 2005/01/10 07:40:26 darco Exp
$
+# S
ynfi
g Bootstrap Script
+# $Id$
#
# This script creates the configure script and Makefile.in files,
# and also fixes a few things in both to ensure a smooth build
#
# This script creates the configure script and Makefile.in files,
# and also fixes a few things in both to ensure a smooth build
@@
-14,7
+14,7
@@
cd "$(dirname $0)"
# Environment Variables
BOOTSTRAP_NAME="$(basename $0)"
# Environment Variables
BOOTSTRAP_NAME="$(basename $0)"
-CONFIG_DIR="
$(pwd)/
config"
+CONFIG_DIR="config"
[ -x /bin/cygpath ] && CONFIG_DIR="`cygpath -m -s "$CONFIG_DIR"`"
[ -x /bin/cygpath ] && CONFIG_DIR="`cygpath -u "$CONFIG_DIR"`"
[ -x /bin/cygpath ] && CONFIG_DIR="`cygpath -m -s "$CONFIG_DIR"`"
[ -x /bin/cygpath ] && CONFIG_DIR="`cygpath -u "$CONFIG_DIR"`"
@@
-29,7
+29,7
@@
export WANT_AUTOMAKE=1.8
export WANT_AUTOCONF_2_5=1
export WANT_AUTOCONF=2.5
export WANT_AUTOCONF_2_5=1
export WANT_AUTOCONF=2.5
-.
$CONFIG_DIR/build.cfg
+.
"$CONFIG_DIR/build.cfg"
SED_SCRIPT="
s/@PACKAGE@/$PACKAGE/g;
SED_SCRIPT="
s/@PACKAGE@/$PACKAGE/g;
@@
-58,7
+58,7
@@
cleanup () {
rm -fr config.cache autom4te*.cache configure.in $TEMPFILE
}
rm -fr config.cache autom4te*.cache configure.in $TEMPFILE
}
-output Prepa
i
ring build environment for $PACKAGE-$VERSION...
+output Preparing build environment for $PACKAGE-$VERSION...
# Look for the CVS directory. If we don't find it, we need to
# ask the user if they know what they are doing.
# Look for the CVS directory. If we don't find it, we need to
# ask the user if they know what they are doing.
@@
-143,21
+143,21
@@
RECONFIG_LTDL=1
for FILENAME in doxygen.cfg pkgconfig.pc project.spec ; do {
output Creating $FILENAME...
for FILENAME in doxygen.cfg pkgconfig.pc 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 pkgconfig.pc to $PACKAGE_TARNAME.pc.in...
mv pkgconfig.pc "$PACKAGE_TARNAME.pc.in"
} ; done
output Renaming pkgconfig.pc to $PACKAGE_TARNAME.pc.in...
mv pkgconfig.pc "$PACKAGE_TARNAME.pc.in"
-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 NEWS >> "$PACKAGE
-$VERSION
.spec"
+output Finishing up $PACKAGE.spec...
+echo %changelog >> "$PACKAGE.spec"
+cat NEWS >> "$PACKAGE.spec"
output Creating configure.in from configure.ac...
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...
output Setting up build environment...
@@
-167,7
+167,7
@@
set -x
# Create all of the build environment files
(
libtoolize -c -f --ltdl &&
# Create all of the build environment files
(
libtoolize -c -f --ltdl &&
- aclocal -I
$CONFIG_DIR
$ACLOCAL_FLAGS &&
+ aclocal -I
"$CONFIG_DIR"
$ACLOCAL_FLAGS &&
autoheader &&
autoconf -o configure &&
automake --foreign --add-missing --copy --include-deps &&
autoheader &&
autoconf -o configure &&
automake --foreign --add-missing --copy --include-deps &&
@@
-191,7
+191,7
@@
set +x
(
cd libltdl &&
( echo "AC_CONFIG_AUX_DIR(../config)" >> configure.[ai][cn] ) &&
(
cd libltdl &&
( echo "AC_CONFIG_AUX_DIR(../config)" >> configure.[ai][cn] ) &&
- aclocal -I
$CONFIG_DIR
&&
+ aclocal -I
"../$CONFIG_DIR"
&&
autoheader &&
autoconf &&
automake --foreign --add-missing --copy
autoheader &&
autoconf &&
automake --foreign --add-missing --copy
@@
-248,7
+248,7
@@
false && {
# sed "
# s/g++ c++/g++3 g++ c++/;
# s/gcc cc/gcc3 gcc cc/;
# sed "
# s/g++ c++/g++3 g++ c++/;
# s/gcc cc/gcc3 gcc cc/;
-# s:"'${prefix}/include'":"'${prefix}/include/s
inf
g'":;
+# s:"'${prefix}/include'":"'${prefix}/include/s
ynfi
g'":;
# s:PREFIX/include:PREFIX/include/ETL:;
# " < configure > $TEMPFILE
# cp $TEMPFILE configure
# s:PREFIX/include:PREFIX/include/ETL:;
# " < configure > $TEMPFILE
# cp $TEMPFILE configure
@@
-310,6
+310,6
@@
output Complete.
cleanup;
# Move back to the current directory
cleanup;
# Move back to the current directory
-cd
$CURR_DIR
+cd
"$CURR_DIR"
make -C src/synfig/proto
make -C src/synfig/proto