summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDane Springmeyer <dane@mapbox.com>2014-11-01 22:57:14 -0400
committerDane Springmeyer <dane@mapbox.com>2014-11-01 22:57:14 -0400
commitcdcc30fa4adf7ffb393e3cd885f8c9ed4281fdc8 (patch)
treedf25bd97dd8fd0a37d5ce686fd69cf3ffec16479 /Makefile
parentfbd71f69291383452ce667b15314ac913eb9150b (diff)
downloadqtlocation-mapboxgl-cdcc30fa4adf7ffb393e3cd885f8c9ed4281fdc8.tar.gz
fix another path to mason
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile18
1 files changed, 9 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 5ea12ff3d2..e611b40720 100644
--- a/Makefile
+++ b/Makefile
@@ -71,15 +71,15 @@ build/linux/mapboxgl-app.xcodeproj: linux/mapboxgl-app.gyp config.gypi
.PHONY: android
android:
- export CXX=`MASON_PLATFORM=android ~/.mason/mason env CXX` && \
- export CC=`MASON_PLATFORM=android ~/.mason/mason env CC` && \
- export LD=`MASON_PLATFORM=android ~/.mason/mason env LD` && \
- export AR=`MASON_PLATFORM=android ~/.mason/mason env AR` && \
- export RANLIB=`MASON_PLATFORM=android ~/.mason/mason env RANLIB` && \
- export LDFLAGS=`MASON_PLATFORM=android ~/.mason/mason env LDFLAGS` && \
- export CFLAGS=`MASON_PLATFORM=android ~/.mason/mason env CFLAGS` && \
- export CPPFLAGS=`MASON_PLATFORM=android ~/.mason/mason env CPPFLAGS` && \
- export PATH=`MASON_PLATFORM=android ~/.mason/mason env PATH` && \
+ export CXX=`MASON_PLATFORM=android ./.mason/mason env CXX` && \
+ export CC=`MASON_PLATFORM=android ./.mason/mason env CC` && \
+ export LD=`MASON_PLATFORM=android ./.mason/mason env LD` && \
+ export AR=`MASON_PLATFORM=android ./.mason/mason env AR` && \
+ export RANLIB=`MASON_PLATFORM=android ./.mason/mason env RANLIB` && \
+ export LDFLAGS=`MASON_PLATFORM=android ./.mason/mason env LDFLAGS` && \
+ export CFLAGS=`MASON_PLATFORM=android ./.mason/mason env CFLAGS` && \
+ export CPPFLAGS=`MASON_PLATFORM=android ./.mason/mason env CPPFLAGS` && \
+ export PATH=`MASON_PLATFORM=android ./.mason/mason env PATH` && \
MASON_PLATFORM=android ./configure config-android.gypi && \
deps/run_gyp mapboxgl.gyp -Iconfig-android.gypi -Dplatform=android --depth=. --generator-output=./build/android -f make-android && \
$(MAKE) -C ./build/android BUILDTYPE=$(BUILDTYPE) V=$(V) mbgl-core