From ef898549445cedeb31d110494a5457e662bac865 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 9 Jun 2000 17:42:40 +0000
Subject: [PATCH] ITS#576: cause subdir make failure to halt subsequent making

---
 build/dir.mk              | 5 +++++
 servers/slapd/Makefile.in | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/build/dir.mk b/build/dir.mk
index 855435e58a..efda69262e 100644
--- a/build/dir.mk
+++ b/build/dir.mk
@@ -13,6 +13,7 @@ all-common: FORCE
 	@for i in $(SUBDIRS) $(ALLDIRS); do 		\
 		echo "  Entering subdirectory $$i";		\
 		( cd $$i; $(MAKE) $(MFLAGS) all );		\
+		if test $$? != 0 ; then exit 1; fi ;	\
 		echo " ";								\
 	done
 
@@ -21,6 +22,7 @@ install-common: FORCE
 	@for i in $(SUBDIRS) $(INSTALLDIRS); do 	\
 		echo "  Entering subdirectory $$i";		\
 		( cd $$i; $(MAKE) $(MFLAGS) install );	\
+		if test $$? != 0 ; then exit 1; fi ;	\
 		echo " ";								\
 	done
 
@@ -29,6 +31,7 @@ clean-common: FORCE
 	@for i in $(SUBDIRS) $(CLEANDIRS); do		\
 		echo "  Entering subdirectory $$i";		\
 		( cd $$i; $(MAKE) $(MFLAGS) clean );	\
+		if test $$? != 0 ; then exit 1; fi ;	\
 		echo " ";								\
 	done
 
@@ -37,6 +40,7 @@ veryclean-common: FORCE
 	@for i in $(SUBDIRS) $(CLEANDIRS); do		\
 		echo "  Entering subdirectory $$i";		\
 		( cd $$i; $(MAKE) $(MFLAGS) veryclean );	\
+		if test $$? != 0 ; then exit 1; fi ;	\
 		echo " ";								\
 	done
 
@@ -45,6 +49,7 @@ depend-common: FORCE
 	@for i in $(SUBDIRS) $(DEPENDDIRS); do		\
 		echo "  Entering subdirectory $$i";		\
 		( cd $$i; $(MAKE) $(MFLAGS) depend );	\
+		if test $$? != 0 ; then exit 1; fi ;	\
 		echo " ";								\
 	done
 
diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index e8060b37b6..4fd313999c 100644
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -163,6 +163,7 @@ sslapd: version.o
 		if [ -d $$i ]; then \
 			echo " "; echo "  cd $$i; $(MAKE) $(MFLAGS) all"; \
 			( cd $$i; $(MAKE) $(MFLAGS) all ); \
+			if test $$? != 0 ; then exit 1; fi ; \
 		fi; \
 	done; \
 	echo " "
@@ -199,6 +200,7 @@ depend-local-srv: FORCE
 		if [ -d $$i ]; then \
 			echo; echo "  cd $$i; $(MAKE) $(MFLAGS) depend"; \
 			( cd $$i; $(MAKE) $(MFLAGS) depend ); \
+			if test $$? != 0 ; then exit 1; fi ; \
 		fi; \
 	done
 	@echo ""
@@ -211,6 +213,7 @@ clean-local-srv: FORCE
 		if [ -d $$i ]; then \
 			echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
 			( cd $$i; $(MAKE) $(MFLAGS) clean ); \
+			if test $$? != 0 ; then exit 1; fi ; \
 		fi; \
 	done
 	rm -f *.tmp all-cffiles
@@ -235,6 +238,7 @@ install-slapd: FORCE
 		if [ -d $$i ]; then \
 			echo; echo "  cd $$i; $(MAKE) $(MFLAGS) install"; \
 			( cd $$i; $(MAKE) $(MFLAGS) install ); \
+			if test $$? != 0 ; then exit 1; fi ; \
 		fi; \
 	    done; \
 	fi
-- 
2.39.5