projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Apply 1695494: fix version number in the Win32 registry, add API_VERSION variable...
[synfig.git]
/
synfig-studio
/
trunk
/
bootstrap
diff --git
a/synfig-studio/trunk/bootstrap
b/synfig-studio/trunk/bootstrap
index
579e7be
..
a0e48bb
100755
(executable)
--- a/
synfig-studio/trunk/bootstrap
+++ b/
synfig-studio/trunk/bootstrap
@@
-1,7
+1,7
@@
#! /bin/sh
#
#! /bin/sh
#
-# S
inf
g Studio Bootstrap Script
-# $Id
: bootstrap,v 1.2 2005/01/10 08:13:44 darco Exp
$
+# S
ynfi
g Studio 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,9
+14,9
@@
cd $(dirname $0)
# Environment Variables
BOOTSTRAP_NAME=$(basename $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;
SED_SCRIPT="
s/@PACKAGE@/$PACKAGE/g;
@@
-26,6
+26,7
@@
s/@PACKAGE_TARNAME@/$PACKAGE_TARNAME/g;
s/@PACKAGE_VERSION@/$PACKAGE_VERSION/g;
s|@SVN_REPOSITORY@|$SVN_REPOSITORY|g;
s/@VERSION@/$VERSION/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;
s/@VERSION_MIN@/$VERSION_MIN/g;
s/@VERSION_REV@/$VERSION_REV/g;
s/@VERSION_MAJ@/$VERSION_MAJ/g;
s/@VERSION_MIN@/$VERSION_MIN/g;
s/@VERSION_REV@/$VERSION_REV/g;
@@
-142,18
+143,18
@@
mv $TEMPFILE aclocal.m4
for FILENAME in project.spec ; do {
output Creating $FILENAME...
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
} ; 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...
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...
@@
-164,7
+165,7
@@
set -x
(
# $INTLTOOLIZE -c &&
$LIBTOOLIZE -c -f &&
(
# $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 &&
aclocalfix &&
$AUTOHEADER &&
$AUTOMAKE --foreign --add-missing --copy --include-deps &&
@@
-186,7
+187,7
@@
set +x
#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
@@
-250,4
+251,4
@@
echo $BOOTSTRAP_NAME: Complete.
cleanup;
# Move back to the current directory
cleanup;
# Move back to the current directory
-cd
$CURR_DIR
+cd
"$CURR_DIR"