automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38185 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago · 38b6e7dd94
parent ebdb3d95b2
commit 38b6e7dd94
1 changed files with 3 additions and 1 deletions
--- 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	\