git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://github.com/russtacular/jquery into russtacular-master
[jquery.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
56b273d
..
2e6848d
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-7,7
+7,7
@@
BUILD_DIR = build
PREFIX = .
DIST_DIR = ${PREFIX}/dist
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\
COMPILER = ${JS_ENGINE} ${BUILD_DIR}/uglify.js --unsafe
BASE_FILES = ${SRC_DIR}/core.js\