aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-28 20:02:27 +0000
committerqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-28 20:02:27 +0000
commite6e2c4f9b4a784c5574052fa8a8ff539050f3cd5 (patch)
tree8100565e4d1b36080f6c378c7960260d2fb8db87
parent8a9a837eeab011107fe07824bf074ff3471952af (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@280231 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--sounds/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/sounds/Makefile b/sounds/Makefile
index 3c035c202..dbe014f35 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