Merge branch 'google:master' into master
diff --git a/testcase/stem_middle.mk b/testcase/stem_middle.mk
index cce73ae..6127c24 100644
--- a/testcase/stem_middle.mk
+++ b/testcase/stem_middle.mk
@@ -1,11 +1,16 @@
 
 test: a/a.a b.b c/c
 
+# ninja always makes the folders leading up to the outputs,
+# so add mkdirs to match that functionality in make
+
 a/%.a:
+	@mkdir -p a
 	@echo $*
 
 %.b:
 	@echo $*
 
 c/%:
+	@mkdir -p c
 	@echo $*