X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Makefile;h=6927dbfd6ba73b8bdc996486f83191ddaef3e04b;hb=refs%2Fheads%2Ffixedbuild;hp=2c7bb8085ae9405007d3f950c4cacc13ef08362b;hpb=8a1156da9b835d826bfb4b82c41bcdd0d87aff05;p=jquery.git diff --git a/Makefile b/Makefile index 2c7bb80..6927dbf 100644 --- a/Makefile +++ b/Makefile @@ -37,8 +37,8 @@ JQ_MIN = ${DIST_DIR}/jquery.min.js SIZZLE_DIR = ${SRC_DIR}/sizzle -JQ_VER = $(shell cat version.txt) -VER = sed "s/@VERSION/${JQ_VER}/" +GIT_VER = $(shell git describe --tags --always --dirty) +VER = sed "s/@VERSION/${GIT_VER}/" DATE=$(shell git log -1 --pretty=format:%ad) @@ -68,7 +68,7 @@ ${SRC_DIR}/selector.js: ${SIZZLE_DIR}/sizzle.js lint: jquery @@if test ! -z ${JS_ENGINE}; then \ echo "Checking jQuery against JSLint..."; \ - ${JS_ENGINE} build/jslint-check.js; \ + ${JS_ENGINE} build/jslint-check.js ${JQ}; \ else \ echo "You must have NodeJS installed in order to test jQuery against JSLint."; \ fi