From c6f7a6652aae03b60ee2196e4f9f8456e35ce1fe Mon Sep 17 00:00:00 2001 From: Walter Doekes Date: Tue, 4 Mar 2014 13:39:13 +0000 Subject: [PATCH] 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 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@409436 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 5f610f7536..6c88ac321e 100644 --- a/Makefile +++ b/Makefile @@ -95,9 +95,6 @@ ifneq ($(wildcard makeopts),) 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 @@ makeopts.embed_rules: menuselect.makeopts $(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