From: Colin Snover <github.com@zetafleet.com>
Date: Tue, 18 Jan 2011 03:06:57 +0000 (-0600)
Subject: Clarify cygwin instructions slightly and swap the order of arguments to which in... 
X-Git-Tag: 1.5rc1~44
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3d0aa196c5420e7f68b32cee38f0cc740d4959c6;p=jquery.git

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.
---

diff --git a/Makefile b/Makefile
index 56b273d68..2e6848d49 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ BUILD_DIR = build
 PREFIX = .
 DIST_DIR = ${PREFIX}/dist
 
-JS_ENGINE ?= `which nodejs node`
+JS_ENGINE ?= `which node nodejs`
 COMPILER = ${JS_ENGINE} ${BUILD_DIR}/uglify.js --unsafe
 
 BASE_FILES = ${SRC_DIR}/core.js\
diff --git a/README.md b/README.md
index 64269b2c5..d56576c81 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,8 @@ Windows users have two options:
    [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
    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
-   [Node.js build instructions](https://github.com/ry/node/wiki/Building-node.js-on-Cygwin-%28Windows%29) or install
+2. Install [Cygwin](http://cygwin.com/) (make sure you install the git, make, and which packages), then either follow
+   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/).
 
 Mac OS users should install Xcode (comes on your Mac OS install DVD, or downloadable from