[asterisk-commits] trunk r12610 - in /trunk: ./ codecs/gsm/Makefile

[asterisk-commits at lists.digium.com]

Author: russell
Date: Sun Mar 12 12:07:23 2006
New Revision: 12610

URL: http://svn.digium.com/view/asterisk?rev=12610&view=rev
Log:
Merged revisions 12577 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r12577 | russell | 2006-03-12 12:57:37 -0500 (Sun, 12 Mar 2006) | 2 lines

fix build on parisc (issue #6704)

........

Modified:
    trunk/   (props changed)
    trunk/codecs/gsm/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/codecs/gsm/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/codecs/gsm/Makefile?rev=12610&r1=12609&r2=12610&view=diff
==============================================================================
--- trunk/codecs/gsm/Makefile (original)
+++ trunk/codecs/gsm/Makefile Sun Mar 12 12:07:23 2006
@@ -239,6 +239,7 @@
 ifneq ($(shell uname -m),sparc64)
 ifneq (${PROC},arm)
 ifneq (${PROC},ia64)
+ifneq ($(shell uname -m), parisc)
 GSM_SOURCES+= $(SRC)/k6opt.s
 endif
 endif
@@ -302,6 +303,7 @@
 ifneq ($(shell uname -m), sparc64)
 ifneq ($(shell uname -m), armv4l)
 ifneq (${PROC},ia64)
+ifneq ($(shell uname -m), parisc)
 GSM_OBJECTS+= $(SRC)/k6opt.o
 endif
 endif