summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index bef809347..0cb20fb5b 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ build:
.PHONY: composer
composer:
-ifeq (, $(shell which composer))
+ifeq (, $(shell which composer 2> /dev/null))
@echo "Using composer from website"
curl -sS https://getcomposer.org/installer | php
php composer.phar install --prefer-dist
@@ -26,7 +26,11 @@ endif
.PHONY: npm
npm:
+ifeq (,$(wildcard $(CURDIR)/package.json))
cd js && $(npm) run build
+else
+ npm run build
+endif
.PHONY: clean
clean: