From: John Resig <jeresig@gmail.com>
Date: Thu, 20 Jan 2011 19:39:28 +0000 (-0500)
Subject: Merge branch 'make_fix' of https://github.com/danheberden/jquery into danheberden... 
X-Git-Url: http://git.asbjorn.it/?p=jquery.git;a=commitdiff_plain;h=35875acd03cc95eace495f887511f2b61f223f7a;hp=3dbd600e1961d9ab5296afbf2b3eb0852ad176e0

Merge branch 'make_fix' of https://github.com/danheberden/jquery into danheberden-make_fix
---

diff --git a/Makefile b/Makefile
index 2e6848d..c708db5 100644
--- a/Makefile
+++ b/Makefile
@@ -96,7 +96,10 @@ min: ${JQ_MIN}
 
 ${JQ_MIN}: ${JQ}
 	@@echo "Building" ${JQ_MIN}
-	@@${COMPILER} ${JQ} > ${JQ_MIN}
+	@@${COMPILER} ${JQ} > ${JQ_MIN}.tmp
+	@@echo ";" >> ${JQ_MIN}.tmp
+	@@sed 's/\*\/(/*\/Ê©(/' ${JQ_MIN}.tmp | tr "Ê©" "\n" > ${JQ_MIN}
+	@@rm -rf ${JQ_MIN}.tmp
 
 clean:
 	@@echo "Removing Distribution directory:" ${DIST_DIR}
diff --git a/build/uglify.js b/build/uglify.js
index cba0586..943ddd8 100644
--- a/build/uglify.js
+++ b/build/uglify.js
@@ -143,7 +143,7 @@ function show_copyright(comments) {
                 if (c.type == "comment1") {
                         ret += "//" + c.value + "\n";
                 } else {
-                        ret += "/*" + c.value + "*/\n";
+                        ret += "/*" + c.value + "*/";
                 }
         }
         return ret;
@@ -181,7 +181,7 @@ function squeeze_it(code) {
                         });
                 if (options.ast)
                         return sys.inspect(ast, null, null);
-                result += time_it("generate", function(){ return pro.gen_code(ast, options.beautify && options.beautify_options) }) + ";";
+                result += time_it("generate", function(){ return pro.gen_code(ast, options.beautify && options.beautify_options) });
                 return result;
         } catch(ex) {
                 sys.debug(ex.stack);