[pitivi] bin: git-environment: Fix mixup in variable names
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] bin: git-environment: Fix mixup in variable names
- Date: Mon, 25 Nov 2013 22:25:51 +0000 (UTC)
commit 554d0fd9f5a829222b9558b6a7f9d91de3b68793
Author: Thibault Saunier <thibault saunier collabora com>
Date: Mon Nov 25 19:22:30 2013 -0300
bin: git-environment: Fix mixup in variable names
bin/pitivi-git-environment.sh | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/bin/pitivi-git-environment.sh b/bin/pitivi-git-environment.sh
index 4cd98c0..679d70f 100755
--- a/bin/pitivi-git-environment.sh
+++ b/bin/pitivi-git-environment.sh
@@ -40,10 +40,13 @@ if ! pkg-config glib-2.0 --atleast-version=$GLIB_RELEASE_TAG; then
else
echo "glib is up to date, using the version already available."
fi
-if pkg-config gobject-introspection-1.0 --atleast-version=$GOBJECT_INTROSPECTION_MINIMUM_VERSION; then
- echo "gobject-introspection-1.0 is up to date, not building."
-else
+
+MODULES_CORE=""
+if ! pkg-config gobject-introspection-1.0 --atleast-version=$GOBJECT_INTROSPECTION_MINIMUM_VERSION; then
+ echo "Building gobject-introspection"
MODULES_CORE="${MODULE_GLIB} gobject-introspection"
+else
+ echo "gobject-introspection-1.0 is up to date, not building."
fi
if python2 -c "import gi; gi.check_version('${PYGOBJECT_RELEASE_TAG}')" &> /dev/null; then
@@ -52,7 +55,7 @@ if python2 -c "import gi; gi.check_version('${PYGOBJECT_RELEASE_TAG}')" &> /dev/
PYTHONPATH=$(python2 -c 'import gi; print(gi._overridesdir)')/../../:$PYTHONPATH
else
PYTHONPATH=$MYPITIVI/pygobject:$PYTHONPATH
- MODULES_CORE="${MODULE_GLIB} pygobject"
+ MODULES_CORE="${MODULES_CORE} pygobject"
fi
# The following decision has to be made before we've set any env variables,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]