Skip to content

Commit

Permalink
Merge pull request #317 from visionmedia/feature/yarnIntegration
Browse files Browse the repository at this point in the history
Added yarn integration to Makefile
  • Loading branch information
thebigredgeek authored Oct 28, 2016
2 parents b39265f + 341e584 commit d188464
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ BIN := $(THIS_DIR)/node_modules/.bin

# applications
NODE ?= $(shell which node)
NPM ?= $(NODE) $(shell which npm)
YARN ?= $(shell which yarn)
PKG ?= $(if $(YARN),$(YARN),$(NODE) $(shell which npm))
BROWSERIFY ?= $(NODE) $(BIN)/browserify

all: dist/debug.js
Expand All @@ -30,7 +31,7 @@ distclean: clean
@rm -rf node_modules

node_modules: package.json
@NODE_ENV= $(NPM) install
@NODE_ENV= $(PKG) install
@touch node_modules

.PHONY: all install clean distclean

0 comments on commit d188464

Please sign in to comment.