summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-06-01 22:28:12 +0200
committerKonstantin Käfer <mail@kkaefer.com>2014-06-01 22:28:36 +0200
commit6bbac8559f385043f59af25dd6517a5ae080498d (patch)
tree5ebe5e33c787aec3a91a86671d5385172b3e5fa4
parent552246f4b037650b0cc57e42444ccea2b5356fd8 (diff)
downloadqtlocation-mapboxgl-6bbac8559f385043f59af25dd6517a5ae080498d.tar.gz
run executable with correct working dir
-rw-r--r--Makefile2
-rw-r--r--linux/main.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 26d3d67fdf..b6e034da85 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ linux: config.gypi linux/llmr-app.gyp node
# Executes the Linux binary
run-linux: linux
- build/$(BUILDTYPE)/mapbox-gl
+ (cd build/$(BUILDTYPE) && ./mapbox-gl)
diff --git a/linux/main.cpp b/linux/main.cpp
index f796a23515..bee52d9014 100644
--- a/linux/main.cpp
+++ b/linux/main.cpp
@@ -43,7 +43,7 @@ int main(int argc, char *argv[]) {
sigaction(SIGINT, &sigIntHandler, NULL);
// read default stylesheet from disk
- std::ifstream stylefile("./build/Release/style.min.js");
+ std::ifstream stylefile("./style.min.js");
std::stringstream stylejson;
stylejson << stylefile.rdbuf();