[svn-commits] wdoekes: branch 1.8 r409436 - /branches/1.8/Makefile

[SVN commits to the Digium repositories]

Author: wdoekes
Date: Tue Mar  4 07:39:13 2014
New Revision: 409436

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=409436
Log:
buildsystem: Unbreak 'make -qp' on 1.8.

r408083 caused trouble with make -qp. Backport r408193 to 1.8 as well.

(closes issue ASTERISK-23382)
Reported by: Corey Farrell

Modified:
    branches/1.8/Makefile

Modified: branches/1.8/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/Makefile?view=diff&rev=409436&r1=409435&r2=409436
==============================================================================
--- branches/1.8/Makefile (original)
+++ branches/1.8/Makefile Tue Mar  4 07:39:13 2014
@@ -95,9 +95,6 @@
   include makeopts
 endif
 
-# we want the MENUSELECT_EMBED var
--include menuselect.makeopts
-
 # start the primary CFLAGS and LDFLAGS with any that were provided
 # to the configure script
 _ASTCFLAGS:=$(CONFIG_CFLAGS)
@@ -330,7 +327,7 @@
 $(SUBDIRS): main/version.c include/asterisk/version.h include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
 
 ifeq ($(findstring $(OSARCH), mingw32 cygwin ),)
-  ifneq ($(MENUSELECT_EMBED),)
+  ifeq ($(shell grep ^MENUSELECT_EMBED=$$ menuselect.makeopts 2>/dev/null),)
     # Non-windows:
     # ensure that all module subdirectories are processed before 'main' during
     # a parallel build, since if there are modules selected to be embedded the