Skip to content

Commit d188464

Browse files
Merge pull request #317 from visionmedia/feature/yarnIntegration
Added yarn integration to Makefile
2 parents b39265f + 341e584 commit d188464

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ BIN := $(THIS_DIR)/node_modules/.bin
88

99
# applications
1010
NODE ?= $(shell which node)
11-
NPM ?= $(NODE) $(shell which npm)
11+
YARN ?= $(shell which yarn)
12+
PKG ?= $(if $(YARN),$(YARN),$(NODE) $(shell which npm))
1213
BROWSERIFY ?= $(NODE) $(BIN)/browserify
1314

1415
all: dist/debug.js
@@ -30,7 +31,7 @@ distclean: clean
3031
@rm -rf node_modules
3132

3233
node_modules: package.json
33-
@NODE_ENV= $(NPM) install
34+
@NODE_ENV= $(PKG) install
3435
@touch node_modules
3536

3637
.PHONY: all install clean distclean

0 commit comments

Comments
 (0)