summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Bockover <abockover@novell.com>2010-01-19 11:41:31 -0500
committerAaron Bockover <abockover@novell.com>2010-01-19 11:42:42 -0500
commit8009f5093329f95c4cccab079f13ac38bf8fc51f (patch)
tree56ffccf6aed51cd7b997ea68c793ed1a359a8309
parent18805b0c6f427ad4d3850a68db50d91545e4ff73 (diff)
[build] pass --enable-osx if profile is darwin
On darwin, also ammend the environment file with GTK2_RC_FILES set to the location of the gtkrc in the bundle skeleton
-rwxr-xr-xbootstrap-bundle8
1 files changed, 6 insertions, 2 deletions
diff --git a/bootstrap-bundle b/bootstrap-bundle
index f73b51c04..9dacdc47c 100755
--- a/bootstrap-bundle
+++ b/bootstrap-bundle
@@ -22,13 +22,17 @@ if ! test -f "build/bundle/$profile"; then
exit 1
fi
-envfile="$(pwd)/$(dirname "$0")/$profile_name.env"
+selfdir="$(pwd)/$(dirname "$0")"
+envfile="$selfdir/$profile_name.env"
pushd build/bundle &>/dev/null
./$profile -bv
./$profile -e > "$envfile"
popd &>/dev/null
+[ $profile_name = darwin ] && \
+ echo "export GTK2_RC_FILES=\"$selfdir/build/bundle/skeleton.darwin/Contents/Resources/etc/gtk-2.0/gtkrc\"" >> "$envfile"
+
source "$envfile"
CONFIGURE_ARGS="
@@ -39,7 +43,7 @@ CONFIGURE_ARGS="
--disable-gnome
--disable-docs
"
-[ $profile_name = osx ] && CONFIGURE_ARGS="$CONFIGURE_ARGS --enable-osx"
+[ $profile_name = darwin ] && CONFIGURE_ARGS="$CONFIGURE_ARGS --enable-osx"
./autogen.sh --prefix="$BUILD_PREFIX" $CONFIGURE_ARGS
cat <<EOF