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

[svn-commits at lists.digium.com]

Author: russell
Date: Wed Jun 28 16:26:31 2006
New Revision: 36228

URL: http://svn.digium.com/view/asterisk?rev=36228&view=rev
Log:
slight change to pulling out the MENUSELECT_CFLAGS from the user and global
level makeopts files - if MENUSELECT_CFLAGS is set to nothing in the user level
makeotps file, then the Makefile should not look in the global file at all.

Modified:
    trunk/Makefile

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=36228&r1=36227&r2=36228&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Jun 28 16:26:31 2006
@@ -133,8 +133,11 @@
 OTHER_SUBDIR_CFLAGS=-I../include -I..
 
 ifeq ($(origin MENUSELECT_CFLAGS),undefined)
-  MENUSELECT_CFLAGS:=$(shell grep MENUSELECT_CFLAGS $(USER_MAKEOPTS) . | cut -f2 -d'=')
-  MENUSELECT_CFLAGS?=$(shell grep MENUSELECT_CFLAGS $(GLOBAL_MAKEOPTS) . | cut -f2 -d'=')
+  MENUSELECT_CFLAGS:=$(shell grep MENUSELECT_CFLAGS $(USER_MAKEOPTS) .)
+  MENUSELECT_CFLAGS?=$(shell grep MENUSELECT_CFLAGS $(GLOBAL_MAKEOPTS) .)
+  ifneq ($(MENUSELECT_CFLAGS),)
+    MENUSELECT_CFLAGS:=$(shell echo $(MENUSELECT_CFLAGS) | cut -f2 -d'=')
+  endif
 endif
 
 ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),$(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)))