[svn-commits] trunk r36226 - /trunk/Makefile

[svn-commits at lists.digium.com]

Author: russell
Date: Wed Jun 28 16:09:02 2006
New Revision: 36226

URL: http://svn.digium.com/view/asterisk?rev=36226&view=rev
Log:
remove the two uses of the $(or ...) function since it is only supported by
GNU make 3.81 which is less than 3 months old (issue #7442, patch by Corydon76)

Modified:
    trunk/Makefile

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=36226&r1=36225&r2=36226&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Jun 28 16:09:02 2006
@@ -133,10 +133,11 @@
 OTHER_SUBDIR_CFLAGS=-I../include -I..
 
 ifeq ($(origin MENUSELECT_CFLAGS),undefined)
-  MENUSELECT_CFLAGS:=$(shell echo $(or $(shell grep MENUSELECT_CFLAGS $(USER_MAKEOPTS) .),$(shell grep MENUSELECT_CFLAGS $(GLOBAL_MAKEOPTS) .)) | cut -f2 -d'=')
-endif
-
-ifeq ($(or $(findstring dont-optimize,$(MAKECMDGOALS)),$(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS))),)
+  MENUSELECT_CFLAGS:=$(shell grep MENUSELECT_CFLAGS $(USER_MAKEOPTS) . | cut -f2 -d'=')
+  MENUSELECT_CFLAGS?=$(shell grep MENUSELECT_CFLAGS $(GLOBAL_MAKEOPTS) . | cut -f2 -d'=')
+endif
+
+ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),$(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)
 # More GSM codec optimization
 # Uncomment to enable MMXTM optimizations for x86 architecture CPU's
 # which support MMX instructions.  This should be newer pentiums,