Commit 3d0aa196 authored by Colin Snover's avatar Colin Snover

Clarify cygwin instructions slightly and swap the order of arguments to which...

Clarify cygwin instructions slightly and swap the order of arguments 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.
parent 9ae837a1
...@@ -7,7 +7,7 @@ BUILD_DIR = build ...@@ -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\
......
...@@ -13,8 +13,8 @@ Windows users have two options: ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment