[asterisk-commits] qwell: trunk r280234 - in /trunk: ./ sounds/Makefile

[SVN commits to the Asterisk project]

Author: qwell
Date: Wed Jul 28 15:04:06 2010
New Revision: 280234

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

Modified:
    trunk/   (props changed)
    trunk/sounds/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.8-merged (original)
+++ branch-1.8-merged Wed Jul 28 15:04:06 2010
@@ -1,1 +1,1 @@
-/branches/1.8:1-279056,279113,279227,279273,279280,279314,279390,279410,279442,279472,279502,279504,279562,279566,279568,279598,279601,279619,279636-279815,279817,279850,279887,279916,279949,279953,280023,280058,280090,280161,280195,280225
+/branches/1.8:1-279056,279113,279227,279273,279280,279314,279390,279410,279442,279472,279502,279504,279562,279566,279568,279598,279601,279619,279636-279815,279817,279850,279887,279916,279949,279953,280023,280058,280090,280161,280195,280225,280233

Modified: trunk/sounds/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/sounds/Makefile?view=diff&rev=280234&r1=280233&r2=280234
==============================================================================
--- trunk/sounds/Makefile (original)
+++ trunk/sounds/Makefile Wed Jul 28 15:04:06 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