# HG changeset patch
# User Tormod Volden <debian.tormod@gmail.com>
# Date 1390862954 -3600
# Node ID ab3f9eb5fc5c3a69a1fed0ce285e93e9a63b3a25
# Parent  bf97abc5bddfa89d67653c02d621a3c74e7a6ae6
level*/makefile: Abort if dsk or dskcopy target fails in subdir

diff -r bf97abc5bddf -r ab3f9eb5fc5c level1/makefile
--- a/level1/makefile	Mon Jan 27 23:48:58 2014 +0100
+++ b/level1/makefile	Mon Jan 27 23:49:14 2014 +0100
@@ -20,11 +20,11 @@
 
 # Make DSK images
 dsk:
-	$(foreach dir, $(dirs), ($(CD) $(dir); make dsk);)
+	$(foreach dir,$(dirs),$(MAKE) -C $(dir) dsk &&) :
 
 # Copy DSK images
 dskcopy:
-	$(foreach dir, $(dirs), ($(CD) $(dir); make dskcopy);)
+	$(foreach dir,$(dirs),$(MAKE) -C $(dir) dskcopy &&) :
 
 # Clean DSK images
 dskclean:
diff -r bf97abc5bddf -r ab3f9eb5fc5c level2/makefile
--- a/level2/makefile	Mon Jan 27 23:48:58 2014 +0100
+++ b/level2/makefile	Mon Jan 27 23:49:14 2014 +0100
@@ -20,11 +20,11 @@
 
 # Make DSK images
 dsk:
-	$(foreach dir, $(dirs), ($(CD) $(dir); make dsk);)
+	$(foreach dir,$(dirs),$(MAKE) -C $(dir) dsk &&) :
 
 # Copy DSK images
 dskcopy:
-	$(foreach dir, $(dirs), ($(CD) $(dir); make dskcopy);)
+	$(foreach dir,$(dirs),$(MAKE) -C $(dir) dskcopy &&) :
 
 # Clean DSK images
 dskclean: