Skip to content
This repository has been archived by the owner on Nov 20, 2018. It is now read-only.

Commit

Permalink
fix(Makefile): npm path not properly set for cygwin (#1698)
Browse files Browse the repository at this point in the history
Detect npm-path properly in cygwin (fixes windows build). Looks for '_NT' to detect if we are on cygwin or not.
  • Loading branch information
fromkeith authored and rnicholus committed Feb 13, 2017
1 parent dd770a4 commit 51d2b25
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,14 @@ version=$(shell node -pe "require('./package.json').version")
dist-out-dir = _dist
pub-dir = $(dist-out-dir)/$(version)

npm-bin = $(shell npm bin)

# properly get npm-bin in cygwin (Eg. CYGWIN_NT-10.0)
platform = $(shell uname -s)
ifeq ($(findstring _NT,$(platform)),_NT)
npm-bin = $(shell cygpath -u $(shell npm bin))
else
npm-bin = $(shell npm bin)
endif

build-out-dir = _build
src-dir = client
Expand Down

0 comments on commit 51d2b25

Please sign in to comment.