diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2016-03-26 15:09:12 +0100 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2016-03-26 15:09:12 +0100 |
| commit | 2d7ee000bf08ed449498c0d13619537ae7b883e2 (patch) | |
| tree | bf471121308515692c8f439793c1d448a81c8d1d /Makefile | |
| parent | d46b227258561ddb8ffd712b326db5b32587155b (diff) | |
update makefile to not fail if no package.json is present
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -159,10 +159,11 @@ appstore: # from the internet .PHONY: test test: -ifeq (,$(wildcard $(CURDIR)/package.json)) +ifneq (,$(wildcard $(CURDIR)/js/package.json)) cd js && $(npm) run test -else - npm run test +endif +ifneq (,$(wildcard $(CURDIR)/package.json)) + $(npm) run test endif ifeq (, $(shell which phpunit 2> /dev/null)) @echo "No phpunit command available, downloading a copy from the web" |