[svn-commits] trunk r30875 - in /trunk: ./ codecs/gsm/Makefile

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Tue May 30 14:20:20 2006
New Revision: 30875

URL: http://svn.digium.com/view/asterisk?rev=30875&view=rev
Log:
Merged revisions 30874 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r30874 | kpfleming | 2006-05-30 14:18:30 -0500 (Tue, 30 May 2006) | 2 lines

check the proper variable...

........

Modified:
    trunk/   (props changed)
    trunk/codecs/gsm/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/codecs/gsm/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/codecs/gsm/Makefile?rev=30875&r1=30874&r2=30875&view=diff
==============================================================================
--- trunk/codecs/gsm/Makefile (original)
+++ trunk/codecs/gsm/Makefile Tue May 30 14:20:20 2006
@@ -212,8 +212,8 @@
 # XXX Keep a space after each findstring argument
 # XXX should merge with GSM_OBJECTS
 ifeq (${OSARCH},Linux)
-ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
-ifeq (,$(findstring ${PROC} , arm ia64 ))
+ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
+ifeq (,$(findstring ${PROC} , arm ia64 s390 ))
 GSM_SOURCES+= $(SRC)/k6opt.s
 endif
 endif