From: Automerge script <automerge@asterisk.org>
Date: Mon, 24 Jul 2006 18:02:36 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.11-netsec~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38b6e7dd940987255e54105074b495baf1eb88cc;p=thirdparty%2Fasterisk.git

automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38185 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile
index 9058f1293c..c39fb0c03a 100644
--- a/codecs/gsm/Makefile
+++ b/codecs/gsm/Makefile
@@ -242,7 +242,7 @@ ifneq ($(shell uname -m),armv4l)
 ifneq ($(shell uname -m),sparc64)
 ifneq (${PROC},arm)
 ifneq ($(shell uname -m), parisc)
-ifneq (${PROC}, s390)
+ifneq ($(shell uname -m),s390)
 GSM_SOURCES+= $(SRC)/k6opt.s
 endif
 endif
@@ -309,6 +309,7 @@ ifneq ($(shell uname -m), alpha)
 ifneq ($(shell uname -m), sparc64)
 ifneq ($(shell uname -m), armv4l)
 ifneq ($(shell uname -m), parisc)
+ifneq ($(shell uname -m),s390)
 GSM_OBJECTS+= $(SRC)/k6opt.o
 endif
 endif
@@ -319,6 +320,7 @@ endif
 endif
 endif
 endif
+endif
 
 TOAST_OBJECTS =	$(SRC)/toast.o 		\
 		$(SRC)/toast_lin.o	\