From 2d7ee000bf08ed449498c0d13619537ae7b883e2 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sat, 26 Mar 2016 15:09:12 +0100 Subject: update makefile to not fail if no package.json is present --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index eb5a5df76..5f1721a0c 100644 --- a/Makefile +++ b/Makefile @@ -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" -- cgit v1.2.3