From: Matthew Jordan <mjordan@digium.com>
Date: Sun, 16 Feb 2014 01:47:45 +0000 (+0000)
Subject: buildsystem: Unbreak the build (infloop) on Asterisk 11+
X-Git-Tag: 11.9.0-rc1~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=450aa97c296df3e166f928098d712e6496d4d6b5;p=thirdparty%2Fasterisk.git

buildsystem: Unbreak the build (infloop) on Asterisk 11+

Apparently r408084 ( https://reviewboard.asterisk.org/r/3212/ ) broke the
build. This patch fixes it by ignoring the .lastclean dependencies if the
MENUSELECT_EMBED variable is not defined.

patches:
  tmp.diff uploaded by wdoekes (License 5674)

Review: https://reviewboard.asterisk.org/r/3228/


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

diff --git a/Makefile b/Makefile
index c052f0d1e9..d112302f01 100644
--- a/Makefile
+++ b/Makefile
@@ -99,8 +99,6 @@ export LDCONFIG_FLAGS
 export PYTHON
 
 -include makeopts
-# we want the MENUSELECT_EMBED var
--include menuselect.makeopts
 
 # start the primary CFLAGS and LDFLAGS with any that were provided
 # to the configure script
@@ -365,7 +363,7 @@ makeopts.embed_rules: menuselect.makeopts
 $(SUBDIRS): makeopts .lastclean main/version.c 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