Merge branch 'makefile_fixes' of https://github.com/azatoth/jquery into azatoth-makefile_fixes

This commit is contained in:
John Resig 2011-03-30 15:23:31 -04:00
commit 8cdafe7704

View file

@ -73,9 +73,9 @@ lint: jquery
echo "You must have NodeJS installed in order to test jQuery against JSLint."; \ echo "You must have NodeJS installed in order to test jQuery against JSLint."; \
fi fi
min: ${JQ_MIN} min: jquery ${JQ_MIN}
${JQ_MIN}: jquery ${JQ_MIN}: ${JQ}
@@if test ! -z ${JS_ENGINE}; then \ @@if test ! -z ${JS_ENGINE}; then \
echo "Minifying jQuery" ${JQ_MIN}; \ echo "Minifying jQuery" ${JQ_MIN}; \
${COMPILER} ${JQ} > ${JQ_MIN}.tmp; \ ${COMPILER} ${JQ} > ${JQ_MIN}.tmp; \