summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorLucas Wojciechowski <lucas@mapbox.com>2015-09-16 17:26:12 -0700
committerMike Morris <michael.patrick.morris@gmail.com>2015-11-04 11:34:35 -0500
commitda569c266b663b815b0fa754be59c78904b92fa6 (patch)
treed17d39da14883baa641f4cc0fa49bc3b88f9db08 /configure
parent8e63084c9e77486c9843ce469e0e8b663bfebb03 (diff)
downloadqtlocation-mapboxgl-da569c266b663b815b0fa754be59c78904b92fa6.tar.gz
[node] enable npm to build mapbox-gl-native package from source
This reverts commit 311bf93abe9f815668e8e0a779c87c3eb5c1199d. more explicit require paths in tests
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure11
1 files changed, 9 insertions, 2 deletions
diff --git a/configure b/configure
index a14f9c83bf..da993492a1 100755
--- a/configure
+++ b/configure
@@ -15,8 +15,15 @@ function abort { >&2 echo -e "\033[1m\033[31m$1\033[0m"; exit 1; }
function info { >&2 echo -e "\033[1m\033[33m$1\033[0m"; }
function warn { >&2 echo -e "\033[1m\033[33m$1\033[0m"; }
-# Install mason
-export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason"
+if [ -d "`pwd`/.git" ]; then
+ info "This build is within a git repository"
+ export MASON_DIR="`pwd`/.mason"
+ export PATH="${MASON_DIR}:${PATH}"
+else
+ info "This build is NOT within a git repository"
+ which mason || abort "You must install mason to build mapbox-gl-native (https://github.com/mapbox/mason)"
+ export MASON_DIR="$(dirname $(readlink $(which mason)))"
+fi
# You can override the function for a particular set of flags by defining a
# print_XXX_flags function in your dependencies.sh file