Skip to content

Commit

Permalink
Clarify cygwin instructions slightly and swap the order of arguments …
Browse files Browse the repository at this point in the history
…to which in Makefile because of a bug in current versions of MSYS that causes only the first argument to /bin/which to be searched.
  • Loading branch information
csnover committed Jan 18, 2011
1 parent 9ae837a commit 3d0aa19
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ BUILD_DIR = build
PREFIX = . PREFIX = .
DIST_DIR = ${PREFIX}/dist DIST_DIR = ${PREFIX}/dist


JS_ENGINE ?= `which nodejs node` JS_ENGINE ?= `which node nodejs`
COMPILER = ${JS_ENGINE} ${BUILD_DIR}/uglify.js --unsafe COMPILER = ${JS_ENGINE} ${BUILD_DIR}/uglify.js --unsafe


BASE_FILES = ${SRC_DIR}/core.js\ BASE_FILES = ${SRC_DIR}/core.js\
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ Windows users have two options:
[GNU make for Windows](http://gnuwin32.sourceforge.net/packages/make.htm), and a [GNU make for Windows](http://gnuwin32.sourceforge.net/packages/make.htm), and a
[binary version of Node.js](http://node-js.prcn.co.cc/). Make sure all three packages are installed to the same [binary version of Node.js](http://node-js.prcn.co.cc/). Make sure all three packages are installed to the same
location (by default, this is C:\Program Files\Git). location (by default, this is C:\Program Files\Git).
2. Install [Cygwin](http://cygwin.com/) (remember to install the git and make packages) and follow the 2. Install [Cygwin](http://cygwin.com/) (make sure you install the git, make, and which packages), then either follow
[Node.js build instructions](https://github.com/ry/node/wiki/Building-node.js-on-Cygwin-%28Windows%29) or install the [Node.js build instructions](https://github.com/ry/node/wiki/Building-node.js-on-Cygwin-%28Windows%29) or install
the [binary version of Node.js](http://node-js.prcn.co.cc/). the [binary version of Node.js](http://node-js.prcn.co.cc/).


Mac OS users should install Xcode (comes on your Mac OS install DVD, or downloadable from Mac OS users should install Xcode (comes on your Mac OS install DVD, or downloadable from
Expand Down

0 comments on commit 3d0aa19

Please sign in to comment.