summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorDaniel Schaal <daniel@schaal.email>2017-08-28 20:54:47 +0200
committerBernhard Posselt <BernhardPosselt@users.noreply.github.com>2017-08-28 20:54:47 +0200
commit0847d3060366d2c9a1add465821672d169339caf (patch)
tree0117d9cc45f6167c4aa611f29430c3909f948298 /Makefile
parent0772f8a49295155f527cbc9b701c16cb553d5866 (diff)
Fix check for path to composer, Fixes #213 (#214)
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 8649d4246..36dc06584 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ appstore_package_name:=$(appstore_artifact_directory)/$(app_name)
npm:=$(shell which npm 2> /dev/null)
composer:=$(shell which composer 2> /dev/null)
ifeq (,$(composer))
- composer=php $(build_tools_directory)/composer.phar
+ composer:=php $(build_tools_directory)/composer.phar
endif
# code signing
@@ -85,7 +85,7 @@ build:
# a copy is fetched from the web
.PHONY: composer
composer:
-ifeq (, $(composer))
+ifeq (, $(shell which composer 2> /dev/null))
@echo "No composer command available, downloading a copy from the web"
mkdir -p $(build_tools_directory)
curl -sS https://getcomposer.org/installer | php