[asterisk-commits] qwell: branch 1.6.2 r280231 - /branches/1.6.2/sounds/Makefile

[SVN commits to the Asterisk project]

Author: qwell
Date: Wed Jul 28 15:02:27 2010
New Revision: 280231

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

Modified: branches/1.6.2/sounds/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/sounds/Makefile?view=diff&rev=280231&r1=280230&r2=280231
==============================================================================
--- branches/1.6.2/sounds/Makefile (original)
+++ branches/1.6.2/sounds/Makefile Wed Jul 28 15:02:27 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