From: Jason Parker <jparker@digium.com>
Date: Wed, 28 Jul 2010 20:04:06 +0000 (+0000)
Subject: Merged revisions 280233 via svnmerge from
X-Git-Tag: 11.0.0-beta1~2528
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d0deecc2fcf0a5e8c8924651a8956e610239d1e;p=thirdparty%2Fasterisk.git

Merged revisions 280233 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r280233 | qwell | 2010-07-28 15:03:22 -0500 (Wed, 28 Jul 2010) | 13 lines

  Merged revisions 280231 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r280231 | qwell | 2010-07-28 15:02:27 -0500 (Wed, 28 Jul 2010) | 6 lines

    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/trunk@280234 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/sounds/Makefile b/sounds/Makefile
index aea43554a1..82a2f61e6c 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