Merge branch 'fail-on-failed-install' into 'master'

Fail on failed install inside for loops See merge request isc-projects/bind9!751
2025-08-30 14:07:59 +00:00 · 2018-09-03 06:18:53 -04:00
parent 73b2648480 142cb0ab8f
commit 3023f14c40
19 changed files with 42 additions and 42 deletions
--- a/bin/check/Makefile.in
+++ b/bin/check/Makefile.in
@@ -88,12 +88,12 @@ install:: named-checkconf@EXEEXT@ named-checkzone@EXEEXT@ installdirs
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-checkconf@EXEEXT@ ${DESTDIR}${sbindir}
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-checkzone@EXEEXT@ ${DESTDIR}${sbindir}
 	(cd ${DESTDIR}${sbindir}; rm -f named-compilezone@EXEEXT@; ${LINK_PROGRAM} named-checkzone@EXEEXT@ named-compilezone@EXEEXT@)
-	for m in ${MANPAGES}; do ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man8; done
+	for m in ${MANPAGES}; do ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man8 || exit 1; done
 	(cd ${DESTDIR}${mandir}/man8; rm -f named-compilezone.8; ${LINK_PROGRAM} named-checkzone.8 named-compilezone.8)

 uninstall::
 	rm -f ${DESTDIR}${mandir}/man8/named-compilezone.8
-	for m in ${MANPAGES}; do rm -f ${DESTDIR}${mandir}/man8/$$m ; done
+	for m in ${MANPAGES}; do rm -f ${DESTDIR}${mandir}/man8/$$m || exit 1; done
 	rm -f ${DESTDIR}${sbindir}/named-compilezone@EXEEXT@
 	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named-checkconf@EXEEXT@
 	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named-checkzone@EXEEXT@
--- a/bin/dig/Makefile.in
+++ b/bin/dig/Makefile.in
@@ -101,12 +101,12 @@ install:: dig@EXEEXT@ host@EXEEXT@ nslookup@EXEEXT@ installdirs
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} \
 		nslookup@EXEEXT@ ${DESTDIR}${bindir}
 	for m in ${MANPAGES}; do \
-		${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man1; \
-		done
+		${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man1 || exit 1; \
+	done

 uninstall::
 	for m in ${MANPAGES}; do \
-		rm -f ${DESTDIR}${mandir}/man1/$$m ; \
+		rm -f ${DESTDIR}${mandir}/man1/$$m || exit 1; \
 	done
 	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${bindir}/nslookup@EXEEXT@
 	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${bindir}/host@EXEEXT@
--- a/bin/dnssec/Makefile.in
+++ b/bin/dnssec/Makefile.in
@@ -115,12 +115,12 @@ installdirs:
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8

 install:: ${TARGETS} installdirs
-	for t in ${TARGETS}; do ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} $$t ${DESTDIR}${sbindir}; done
-	for m in ${MANPAGES}; do ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man8; done
+	for t in ${TARGETS}; do ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} $$t ${DESTDIR}${sbindir} || exit 1; done
+	for m in ${MANPAGES}; do ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man8 || exit 1; done

 uninstall::
-	for m in ${MANPAGES}; do rm -f ${DESTDIR}${mandir}/man8/$$m ; done
-	for t in ${TARGETS}; do ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/$$t ; done
+	for m in ${MANPAGES}; do rm -f ${DESTDIR}${mandir}/man8/$$m || exit 1; done
+	for t in ${TARGETS}; do ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/$$t || exit 1; done

 clean distclean::
 	rm -f ${TARGETS}
--- a/lib/bind9/include/bind9/Makefile.in
+++ b/lib/bind9/include/bind9/Makefile.in
@@ -30,10 +30,10 @@ installdirs:

 install:: installdirs
 	for i in ${HEADERS}; do \
-		${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/bind9 ; \
+		${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/bind9 || exit 1; \
 	done

 uninstall::
 	for i in ${HEADERS}; do \
-		rm -f ${DESTDIR}${includedir}/bind9/$$i ; \
+		rm -f ${DESTDIR}${includedir}/bind9/$$i || exit 1; \
 	done
--- a/lib/dns/include/dns/Makefile.in
+++ b/lib/dns/include/dns/Makefile.in
@@ -45,16 +45,16 @@ installdirs:

 install:: installdirs
 	for i in ${HEADERS}; do \
-		${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/dns ; \
+		${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/dns || exit 1; \
 	done
 	for i in ${GENHEADERS}; do \
-		${INSTALL_DATA} $$i ${DESTDIR}${includedir}/dns ; \
+		${INSTALL_DATA} $$i ${DESTDIR}${includedir}/dns || exit 1; \
 	done

 uninstall::
 	for i in ${GENHEADERS}; do \
-		rm -f ${DESTDIR}${includedir}/dns/$$i ; \
+		rm -f ${DESTDIR}${includedir}/dns/$$i || exit 1; \
 	done
 	for i in ${HEADERS}; do \
-		rm -f ${DESTDIR}${includedir}/dns/$$i ; \
+		rm -f ${DESTDIR}${includedir}/dns/$$i || exit 1; \
 	done
--- a/lib/dns/include/dst/Makefile.in
+++ b/lib/dns/include/dst/Makefile.in
@@ -25,10 +25,10 @@ installdirs:

 install:: installdirs
 	for i in ${HEADERS}; do \
-		${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/dst ; \
+		${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/dst || exit 1; \
 	done

 uninstall::
 	for i in ${HEADERS}; do \
-		rm -f ${DESTDIR}${includedir}/dst/$$i ; \
+		rm -f ${DESTDIR}${includedir}/dst/$$i || exit 1; \
 	done
--- a/lib/irs/include/irs/Makefile.in
+++ b/lib/irs/include/irs/Makefile.in
@@ -28,7 +28,7 @@ installdirs:

 install:: installdirs
 	for i in ${HEADERS}; do \
-		${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/irs ; \
+		${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/irs || exit 1; \
 	done
 	${INSTALL_DATA} netdb.h ${DESTDIR}${includedir}/irs
 	${INSTALL_DATA} platform.h ${DESTDIR}${includedir}/irs
@@ -37,7 +37,7 @@ uninstall::
 	rm -f ${DESTDIR}${includedir}/irs/platform.h
 	rm -f ${DESTDIR}${includedir}/irs/netdb.h
 	for i in ${HEADERS}; do \
-		rm -f ${DESTDIR}${includedir}/irs/$$i ; \
+		rm -f ${DESTDIR}${includedir}/irs/$$i || exit 1; \
 	done

 distclean::
--- a/lib/irs/win32/include/irs/Makefile.in
+++ b/lib/irs/win32/include/irs/Makefile.in
@@ -22,5 +22,5 @@ installdirs:

 install:: installdirs
 	for i in ${HEADERS}; do \
-		${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/irs ; \
+		${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/irs || exit 1; \
 	done
--- a/lib/isc/include/isc/Makefile.in
+++ b/lib/isc/include/isc/Makefile.in
@@ -32,7 +32,7 @@ HEADERS =	aes.h app.h assertions.h atomic.h backtrace.h base32.h base64.h \
 		radix.h random.h ratelimiter.h refcount.h regex.h \
 		region.h resource.h result.h resultclass.h rwlock.h \
 		safe.h serial.h sha1.h sha2.h sockaddr.h socket.h \
-		stats.h stdio.h stdlib.h strerr.h string.h symtab.h \
+		stats.h stdio.h strerr.h string.h symtab.h \
 	        task.h taskpool.h timer.h tm.h types.h util.h version.h \
 		xml.h

@@ -46,14 +46,14 @@ installdirs:

 install:: installdirs
 	for i in ${HEADERS}; do \
-		${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/isc ; \
+		${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/isc || exit 1; \
 	done
 	${INSTALL_DATA} platform.h ${DESTDIR}${includedir}/isc

 uninstall::
 	rm -f ${DESTDIR}${includedir}/isc/platform.h
 	for i in ${HEADERS}; do \
-		rm -f ${DESTDIR}${includedir}/isc/$$i ; \
+		rm -f ${DESTDIR}${includedir}/isc/$$i || exit 1; \
 	done

 distclean::
--- a/lib/isc/include/pk11/Makefile.in
+++ b/lib/isc/include/pk11/Makefile.in
@@ -29,10 +29,10 @@ installdirs:

 install:: installdirs
 	for i in ${HEADERS}; do \
-		${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/pk11 ; \
+		${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/pk11 || exit 1; \
 	done

 uninstall::
 	for i in ${HEADERS}; do \
-		rm -f ${DESTDIR}${includedir}/pk11/$$i ; \
+		rm -f ${DESTDIR}${includedir}/pk11/$$i || exit 1; \
 	done
--- a/lib/isc/include/pkcs11/Makefile.in
+++ b/lib/isc/include/pkcs11/Makefile.in
@@ -29,10 +29,10 @@ installdirs:

 install:: installdirs
 	for i in ${HEADERS}; do \
-		${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/pkcs11 ; \
+		${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/pkcs11 || exit 1; \
 	done

 uninstall::
 	for i in ${HEADERS}; do \
-		rm -f ${DESTDIR}${includedir}/pkcs11/$$i ; \
+		rm -f ${DESTDIR}${includedir}/pkcs11/$$i || exit 1; \
 	done
--- a/lib/isc/pthreads/include/isc/Makefile.in
+++ b/lib/isc/pthreads/include/isc/Makefile.in
@@ -25,10 +25,10 @@ installdirs:

 install:: installdirs
 	for i in ${HEADERS}; do \
-		${INSTALL_DATA} $(srcdir)/$$i ${DESTDIR}${includedir}/isc ; \
+		${INSTALL_DATA} $(srcdir)/$$i ${DESTDIR}${includedir}/isc || exit 1; \
 	done

 uninstall::
 	for i in ${HEADERS}; do \
-		rm -f ${DESTDIR}${includedir}/isc/$$i ; \
+		rm -f ${DESTDIR}${includedir}/isc/$$i || exit 1; \
 	done
--- a/lib/isc/unix/include/isc/Makefile.in
+++ b/lib/isc/unix/include/isc/Makefile.in
@@ -14,7 +14,7 @@ top_srcdir =	@top_srcdir@
 VERSION=@BIND9_VERSION@

 HEADERS =	dir.h net.h netdb.h offset.h stat.h \
-		stdtime.h strerror.h syslog.h time.h
+		stdtime.h syslog.h time.h

 SUBDIRS =
 TARGETS =
@@ -26,10 +26,10 @@ installdirs:

 install:: installdirs
 	for i in ${HEADERS}; do \
-		${INSTALL_DATA} $(srcdir)/$$i ${DESTDIR}${includedir}/isc ; \
+		${INSTALL_DATA} $(srcdir)/$$i ${DESTDIR}${includedir}/isc || exit 1; \
 	done

 uninstall::
 	for i in ${HEADERS}; do \
-		rm -f ${DESTDIR}${includedir}/isc/$$i ; \
+		rm -f ${DESTDIR}${includedir}/isc/$$i || exit 1; \
 	done
--- a/lib/isc/unix/include/pkcs11/Makefile.in
+++ b/lib/isc/unix/include/pkcs11/Makefile.in
@@ -22,10 +22,10 @@ installdirs:

 install:: installdirs
 	for i in ${HEADERS}; do \
-		${INSTALL_DATA} $(srcdir)/$$i ${DESTDIR}${includedir}/pkcs11 ; \
+		${INSTALL_DATA} $(srcdir)/$$i ${DESTDIR}${includedir}/pkcs11 || exit 1; \
 	done

 uninstall::
 	for i in ${HEADERS}; do \
-		rm -f ${DESTDIR}${includedir}/pkcs11/$$i ; \
+		rm -f ${DESTDIR}${includedir}/pkcs11/$$i || exit 1; \
 	done
--- a/lib/isc/win32/include/isc/Makefile.in
+++ b/lib/isc/win32/include/isc/Makefile.in
@@ -26,5 +26,5 @@ installdirs:

 install:: installdirs
 	for i in $(HEADERS); do \
-		$(INSTALL_DATA) $(srcdir)\$$i $(includedir)\isc ; \
+		$(INSTALL_DATA) $(srcdir)\$$i $(includedir)\isc || exit 1; \
 	done
--- a/lib/isc/win32/include/pkcs11/Makefile.in
+++ b/lib/isc/win32/include/pkcs11/Makefile.in
@@ -22,5 +22,5 @@ installdirs:

 install:: installdirs
 	for i in ${HEADERS}; do \
-		${INSTALL_DATA} $(srcdir)/$$i ${DESTDIR}${includedir}/pkcs11 ; \
+		${INSTALL_DATA} $(srcdir)/$$i ${DESTDIR}${includedir}/pkcs11 || exit 1; \
 	done
--- a/lib/isccc/include/isccc/Makefile.in
+++ b/lib/isccc/include/isccc/Makefile.in
@@ -30,10 +30,10 @@ installdirs:

 install:: installdirs
 	for i in ${HEADERS}; do \
-		${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/isccc ; \
+		${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/isccc || exit 1; \
 	done

 uninstall::
 	for i in ${HEADERS}; do \
-		rm -f ${DESTDIR}${includedir}/isccc/$$i ; \
+		rm -f ${DESTDIR}${includedir}/isccc/$$i || exit 1; \
 	done
--- a/lib/isccfg/include/isccfg/Makefile.in
+++ b/lib/isccfg/include/isccfg/Makefile.in
@@ -31,10 +31,10 @@ installdirs:

 install:: installdirs
 	for i in ${HEADERS}; do \
-		${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/isccfg ; \
+		${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/isccfg || exit 1; \
 	done

 uninstall::
 	for i in ${HEADERS}; do \
-		rm -f ${DESTDIR}${includedir}/isccfg/$$i ; \
+		rm -f ${DESTDIR}${includedir}/isccfg/$$i || exit 1; \
 	done
--- a/lib/ns/include/ns/Makefile.in
+++ b/lib/ns/include/ns/Makefile.in
@@ -26,10 +26,10 @@ installdirs:

 install:: installdirs
 	for i in ${HEADERS}; do \
-		${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/ns ; \
+		${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/ns || exit 1 ; \
 	done

 uninstall::
 	for i in ${HEADERS}; do \
-		rm -f ${DESTDIR}${includedir}/ns/$$i ; \
+		rm -f ${DESTDIR}${includedir}/ns/$$i || exit 1 ; \
 	done