slight change to pulling out the MENUSELECT_CFLAGS from the user and global
authorRussell Bryant <russell@russellbryant.com>
Wed, 28 Jun 2006 21:26:31 +0000 (21:26 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 28 Jun 2006 21:26:31 +0000 (21:26 +0000)
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.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36228 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Makefile

index 497004d..bbf3a66 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -133,8 +133,11 @@ MOD_SUBDIR_CFLAGS=-I../include -I..
 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)))