diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2016-01-18 11:20:05 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2016-01-18 11:20:05 -0800 |
| commit | 040d3cd413a303b43e72607c6d6ba05932a9a5b3 (patch) | |
| tree | 387230e652bdc54d2273566882b9ccc80b85137b /scripts/build.sh | |
| parent | 37c10c8fd62ab85237922b2a267f3cf2b4252d82 (diff) | |
| download | subsurface-040d3cd413a303b43e72607c6d6ba05932a9a5b3.tar.gz | |
build.sh: fix broken logic to pull mobile components
In commit f28f03afe2 ("build.sh: make it easier to build
Subsurface-mobile") I mistakenly broke the logic that decides to run the
mobilecomponents.sh script.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts/build.sh')
| -rwxr-xr-x | scripts/build.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/build.sh b/scripts/build.sh index 134aa1c7d..f171feb1e 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -183,12 +183,6 @@ if [ "$SUBSURFACE_EXECUTABLE" = "DesktopExecutable" ] ; then make install fi -# pull the plasma-mobile components from upstream if building Subsurface-mobile -if [ "$SUBSURFACE_EXECUTABLE" = "MobileExecutable" ] ; then - cd $SRC/subsurface - bash ./scripts/mobilecomponents.sh -fi - # finally, build Subsurface if [ $PLATFORM = Darwin ] ; then @@ -203,6 +197,12 @@ for (( i=0 ; i < ${#BUILDS[@]} ; i++ )) ; do BUILDDIR=${BUILDDIRS[$i]} echo "build $SUBSURFACE_EXECUTABLE in $BUILDDIR" + # pull the plasma-mobile components from upstream if building Subsurface-mobile + if [ "$SUBSURFACE_EXECUTABLE" = "MobileExecutable" ] ; then + cd $SRC/subsurface + bash ./scripts/mobilecomponents.sh + fi + mkdir -p $SRC/subsurface/$BUILDDIR cd $SRC/subsurface/$BUILDDIR export CMAKE_PREFIX_PATH=$INSTALL_ROOT/lib/cmake |