From: Automerge script <automerge@asterisk.org>
Date: Tue, 30 May 2006 20:05:55 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.8-netsec~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b23589112fa13aed768b260c0d49a75eb3551f7;p=thirdparty%2Fasterisk.git

automerge commit

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

diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile
index 8bc53e88d5..9058f1293c 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 ($(shell uname -m), s390)
+ifneq (${PROC}, s390)
 GSM_SOURCES+= $(SRC)/k6opt.s
 endif
 endif