X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Makefile;h=d11d4e1ff36c0f013bc26d03248b07af47055a17;hb=1ed405176bfac58f35c3027006e152a4725fd63b;hp=e026d9e679fa33bbdf7ab0689fae254d56da303c;hpb=950b5d64a27994db1697eb4e605f5ea48ad8021b;p=jquery.git

diff --git a/Makefile b/Makefile
index e026d9e..d11d4e1 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ VER = sed s/@VERSION/${JQ_VER}/
 RHINO = java -jar ${BUILD_DIR}/js.jar
 MINJAR = java -jar ${BUILD_DIR}/google-compiler-20091218.jar
 
-DATE=`git log -1 | grep Date: | sed 's/[^:]*: *//'`
+DATE=`git log -1 --pretty=format:%ad`
 
 all: jquery lint min
 	@@echo "jQuery build complete."
@@ -56,12 +56,14 @@ ${JQ}: selector ${MODULES}
 	@@mkdir -p ${DIST_DIR}
 
 	@@cat ${MODULES} | \
+		sed 's/.function..jQuery...{//' | \
+		sed 's/}...jQuery..;//' | \
 		sed 's/Date:./&'"${DATE}"'/' | \
 		${VER} > ${JQ};
 
 selector: ${DIST_DIR} init
 	@@echo "Building selector code from Sizzle"
-	@@sed '/EXPOSE/r src/sizzle-jquery.js' src/sizzle/sizzle.js > src/selector.js
+	@@sed '/EXPOSE/r src/sizzle-jquery.js' src/sizzle/sizzle.js | grep -v window.Sizzle > src/selector.js
 
 lint: ${JQ}
 	@@echo "Checking jQuery against JSLint..."
@@ -80,7 +82,7 @@ clean:
 	@@rm -rf ${DIST_DIR}
 
 	@@echo "Removing built copy of Sizzle"
-	@@rm src/selector.js
+	@@rm -f src/selector.js
 
 	@@echo "Removing cloned directories"
 	@@rm -rf test/qunit src/sizzle