diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-28 20:04:06 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-28 20:04:06 +0000 |
| commit | bc2eb1c9d832e8cf82e66613b7be160cc09db149 (patch) | |
| tree | bda725403d3a8b00bccf217e5678c3ca847d75a2 | |
| parent | 2fc11f039a91bb04723540297b2688461e71634e (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@280234 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | sounds/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sounds/Makefile b/sounds/Makefile index aea43554a..82a2f61e6 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 |