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

svn-commits at lists.digium.com svn-commits at lists.digium.com
Wed Jun 28 14:33:40 MST 2006


Author: russell
Date: Wed Jun 28 16:33:39 2006
New Revision: 36229

URL: http://svn.digium.com/view/asterisk?rev=36229&view=rev
Log:
?= just checks to see if a variable is not yet defined.  If MENUSELECT_CFLAGS
was not found in the user level makeopts file, the variable is defined, but
empty.

I wish we could just require GNU make 3.81  :)

Modified:
    trunk/Makefile

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=36229&r1=36228&r2=36229&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Jun 28 16:33:39 2006
@@ -134,7 +134,9 @@
 
 ifeq ($(origin MENUSELECT_CFLAGS),undefined)
   MENUSELECT_CFLAGS:=$(shell grep MENUSELECT_CFLAGS $(USER_MAKEOPTS) .)
-  MENUSELECT_CFLAGS?=$(shell grep MENUSELECT_CFLAGS $(GLOBAL_MAKEOPTS) .)
+  ifeq ($(MENUSELECT_CFLAGS),)
+    MENUSELECT_CFLAGS:=$(shell grep MENUSELECT_CFLAGS $(GLOBAL_MAKEOPTS) .)
+  endif
   ifneq ($(MENUSELECT_CFLAGS),)
     MENUSELECT_CFLAGS:=$(shell echo $(MENUSELECT_CFLAGS) | cut -f2 -d'=')
   endif



More information about the svn-commits mailing list