From ecab03293c5919cd6d0afccc46a2c5ff37e4f7e5 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 28 Jun 2006 21:26:31 +0000 Subject: [PATCH] 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. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36228 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 497004d5ca..bbf3a66997 100644 --- 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))) -- 2.47.2