summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2017-04-11 16:38:50 +0200
committerKonstantin Käfer <mail@kkaefer.com>2017-04-11 17:03:11 +0200
commit1d33bf774f7d0248a72529840e155c4716a99851 (patch)
tree5454e5a8b6559e3114e454193da15253d4ab9af0 /Makefile
parent10c6f1fe4f530af5c2032ebfce19c4fe29d39642 (diff)
downloadqtlocation-mapboxgl-1d33bf774f7d0248a72529840e155c4716a99851.tar.gz
[android] add second pipe character to fix errors detecting nodejs
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 8346eda0c5..670d5a71ca 100644
--- a/Makefile
+++ b/Makefile
@@ -496,7 +496,7 @@ style-code: android-style-code
# Configuration file for running CMake from Gradle within Android Studio.
platform/android/configuration.gradle:
- @echo "ext {\n node = '`command -v node | command -v nodejs`'\n npm = '`command -v npm`'\n ccache = '`command -v ccache`'\n}" > $@
+ @echo "ext {\n node = '`command -v node || command -v nodejs`'\n npm = '`command -v npm`'\n ccache = '`command -v ccache`'\n}" > $@
define ANDROID_RULES
# $1 = arm-v7 (short arch)