aboutsummaryrefslogtreecommitdiffstats
path: root/codecs
diff options
context:
space:
mode:
authormurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2006-07-24 17:05:56 +0000
committermurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2006-07-24 17:05:56 +0000
commit27037bc2df250a77422521b7740a184ef2709024 (patch)
tree59a9992a1040d39ef3e61abfd6b26bd2f3051e15 /codecs
parent22e26d4af013ab21e7b80ed31ffc594636d5f6f4 (diff)
This fixes a compile problem for s390 as reported in bug 7253.
Tested on both an s390 and non-s390 machine. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@38167 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
-rw-r--r--codecs/gsm/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile
index 9058f1293..c39fb0c03 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 \