X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=Makefile;h=1e838bb3c7cb1934ea0983c87a44238404b0a341;hb=refs%2Fheads%2Fbuild-fixes;hp=48a885da28e05dbab58f390c862f2c5544c375c1;hpb=ba43d37394b6018779d9a668c548e11579cd424a;p=jquery.git diff --git a/Makefile b/Makefile index 48a885d..1e838bb 100644 --- a/Makefile +++ b/Makefile @@ -38,8 +38,8 @@ JQ_MIN = ${DIST_DIR}/jquery.min.js SIZZLE_DIR = ${SRC_DIR}/sizzle QUNIT_DIR = ${TEST_DIR}/qunit -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) @@ -95,7 +95,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