From: Jason Parker <jparker@digium.com>
Date: Wed, 28 Jul 2010 20:02:27 +0000 (+0000)
Subject: Work around some silly behavior on BSD.
X-Git-Tag: 1.6.2.12-rc1~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c6a11e2ef2570cc821dc6b77e5e9a6689db1ca2;p=thirdparty%2Fasterisk.git

Work around some silly behavior on BSD.

A non-zero exit from a subshell should make the build fail.

(closes issue #17621)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@280231 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/sounds/Makefile b/sounds/Makefile
index 3c035c202b..dbe014f359 100644
--- a/sounds/Makefile
+++ b/sounds/Makefile
@@ -86,7 +86,7 @@ $(1)/.asterisk-$(2)$(if $(3),-$(3),)-%: have_download
 	    rm -f $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE} $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE}.sha1 $$$${PACKAGE} $$$${PACKAGE}.sha1; \
 	    echo "Bad checksum: $$$${PACKAGE}" 1>&2; \
 	    exit 1; \
-	  ); \
+	  ) || exit 1; \
 	rm -f $$(subst -$(4),,$$@)-*; \
 	(cd $(1)$(if $(3),/$(3),); cat $$(CURDIR)/$$$${PACKAGE} | gzip -d | tar xof -) && touch $$@
 endef
@@ -107,7 +107,7 @@ asterisk-$(1)-%.tar.gz: have_download
 	    rm -f $$(SOUNDS_CACHE_DIR)/$$@ $$(SOUNDS_CACHE_DIR)/$$@.sha1 $$@ $$@.sha1; \
 	    echo "Bad checksum: $$@" 1>&2; \
 	    exit 1; \
-	  )
+	  ) || exit 1
 endef
 
 else