From: Kevin P. Fleming Date: Tue, 30 May 2006 19:20:20 +0000 (+0000) Subject: Merged revisions 30874 via svnmerge from X-Git-Tag: 1.4.0-beta1~1152 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9afb0e1cd2f0e100eb6d335494a33a7785dcf774;p=thirdparty%2Fasterisk.git 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... ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@30875 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile index 12a74f7f6f..7be253e848 100644 --- a/codecs/gsm/Makefile +++ b/codecs/gsm/Makefile @@ -212,8 +212,8 @@ GSM_SOURCES = $(SRC)/add.c \ # 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