diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2016-03-25 18:33:27 +0100 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2016-03-25 18:33:27 +0100 |
| commit | 4695232a13996c116d52608576177fc50cb6d03e (patch) | |
| tree | 11477545d05e17b371d8d0a72a61e33cbf9eb8fd | |
| parent | cde4d396245434a9e62f7e01cef131a27ff4ec60 (diff) | |
search package.json in app directory or js directory
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | vendor/composer/LICENSE | 2 |
2 files changed, 6 insertions, 2 deletions
@@ -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: diff --git a/vendor/composer/LICENSE b/vendor/composer/LICENSE index 1a2812488..c8d57af8b 100644 --- a/vendor/composer/LICENSE +++ b/vendor/composer/LICENSE @@ -1,5 +1,5 @@ -Copyright (c) 2016 Nils Adermann, Jordi Boggiano +Copyright (c) 2015 Nils Adermann, Jordi Boggiano Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal |