summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Morris <michael.patrick.morris@gmail.com>2015-01-29 18:03:56 -0500
committerKonstantin Käfer <mail@kkaefer.com>2015-02-04 10:49:09 +0100
commit9f8ddf2930def65252a28db5cfd7671d7406e3cf (patch)
treea1669c24f640dcdeb9e737affb977abcd5d4885a
parent29baacf3a5bb773d94d08d16b81c3cda45a44eb6 (diff)
downloadqtlocation-mapboxgl-9f8ddf2930def65252a28db5cfd7671d7406e3cf.tar.gz
define install_prefix in CONFIG_STRING
-rw-r--r--Makefile1
-rw-r--r--mbgl.gyp1
2 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 0b7d2b6da3..3b1bbfcbfd 100644
--- a/Makefile
+++ b/Makefile
@@ -62,6 +62,7 @@ CONFIG_STRING += -Dplatform_lib=$(PLATFORM)
CONFIG_STRING += -Dasset_lib=$(ASSET)
CONFIG_STRING += -Dhttp_lib=$(HTTP)
CONFIG_STRING += -Dcache_lib=$(CACHE)
+CONFIG_STRING += -Dinstall_prefix=$(PREFIX)
CONFIG_STRING += --depth=.
CONFIG_STRING += -Goutput_dir=..
diff --git a/mbgl.gyp b/mbgl.gyp
index e25f4a2352..b6b00455e1 100644
--- a/mbgl.gyp
+++ b/mbgl.gyp
@@ -8,6 +8,7 @@
'./gyp/standalone.gypi',
'./gyp/core.gypi',
'./gyp/none.gypi',
+ './gyp/install.gypi',
],
'conditions': [
['headless_lib == "cgl"', { 'includes': [ './gyp/headless-cgl.gypi' ] } ],