[asterisk-commits] qwell: branch 1.8 r280233 - in /branches/1.8: ./ sounds/Makefile

[SVN commits to the Asterisk project]

Author: qwell
Date: Wed Jul 28 15:03:22 2010
New Revision: 280233

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=280233
Log:
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)
........

Modified:
    branches/1.8/   (props changed)
    branches/1.8/sounds/Makefile

Propchange: branches/1.8/
------------------------------------------------------------------------------
--- branch-1.6.2-merged (original)
+++ branch-1.6.2-merged Wed Jul 28 15:03:22 2010
@@ -1,1 +1,1 @@
-/branches/1.6.2:1-279056,279207,279501,279561,279597,279609,279657,279784,279849,279946,280089,280160,280193
+/branches/1.6.2:1-279056,279207,279501,279561,279597,279609,279657,279784,279849,279946,280089,280160,280193,280231

Modified: branches/1.8/sounds/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/sounds/Makefile?view=diff&rev=280233&r1=280232&r2=280233
==============================================================================
--- branches/1.8/sounds/Makefile (original)
+++ branches/1.8/sounds/Makefile Wed Jul 28 15:03:22 2010
@@ -86,7 +86,7 @@
 	    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 @@
 	    rm -f $$(SOUNDS_CACHE_DIR)/$$@ $$(SOUNDS_CACHE_DIR)/$$@.sha1 $$@ $$@.sha1; \
 	    echo "Bad checksum: $$@" 1>&2; \
 	    exit 1; \
-	  )
+	  ) || exit 1
 endef
 
 else