Merge branch 'master' of ssh://git.mochimedia.net//data/git/mochi/moc…

…hiweb

Makefile

@@ -8,7 +8,7 @@ test: ebin/
 	(cd src;$(MAKE) test)
 
 clean:
-	(cd src;$(MAKE) clean)
+	rm -rf ebin
 
 clean_plt:
 	(cd src;$(MAKE) clean_plt)

scripts/new_mochiweb.erl

@@ -9,6 +9,16 @@ main([Name]) ->
 main([Name, Dest]) ->
     ensure(),
     DestDir = filename:absname(Dest),
+    case code:which(mochiweb_skel) of
+        non_existing ->
+            io:format("mochiweb not compiled, running make~n"),
+            os:cmd("(cd \"" ++ filename:dirname(escript:script_name())
+                   ++ "/..\"; make)"),
+            ensure(),
+            code:rehash();
+        _ ->
+            ok
+    end,
     ok = mochiweb_skel:skelcopy(DestDir, Name);
 main(_) ->
     usage().

src/mochiweb_skel.erl

@@ -14,9 +14,11 @@ skelcopy(DestDir, Name) ->
                    N + 1
            end,
     skelcopy(src(), DestDir, Name, LDst),
+    DestLink = filename:join([DestDir, Name, "deps", "mochiweb-src"]),
+    ok = filelib:ensure_dir(DestLink),
     ok = file:make_symlink(
-        filename:join(filename:dirname(code:which(?MODULE)), ".."),
-        filename:join([DestDir, Name, "deps", "mochiweb-src"])).
+           filename:join(filename:dirname(code:which(?MODULE)), ".."),
+           DestLink).
 
 %% Internal API