summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 0ef81e26f..5253ac2ea 100644
--- a/Makefile
+++ b/Makefile
@@ -101,8 +101,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
@@ -361,7 +359,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