diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2011-10-14 21:37:51 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2011-10-14 21:37:51 +0000 |
| commit | c292e39cdc62756eb0219aeddebedca52860d961 (patch) | |
| tree | 7bff0a08952c9a79090c53c1bd2aca844c73983b /Makefile.moddir_rules | |
| parent | 899df042f517ee21d7d090db68eb393a2ff32f44 (diff) | |
Change the internal name of the menuselect options that are used to control
whether modules are embedded or not; using just the bare category name led to
accidentally enabling these options when users used the wrong "--enable"
operation on the menuselect command line.
Now the internal option names are prefixed with "EMBED_", so they won't be
the same as the name of the category containing the modules they control
the embedding of.
........
Merged revisions 341022 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 341023 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341024 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'Makefile.moddir_rules')
| -rw-r--r-- | Makefile.moddir_rules | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules index c0db889da..e96342ee2 100644 --- a/Makefile.moddir_rules +++ b/Makefile.moddir_rules @@ -1,6 +1,6 @@ # # Asterisk -- A telephony toolkit for Linux. -# +# # Makefile rules for subdirectories containing modules # # Copyright (C) 2006, Digium, Inc. @@ -46,7 +46,7 @@ endif C_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_C_MODS)) CC_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_CC_MODS)) -ifneq ($(findstring $(MENUSELECT_CATEGORY),$(MENUSELECT_EMBED)),) +ifneq ($(findstring EMBED_$(MENUSELECT_CATEGORY),$(MENUSELECT_EMBED)),) EMBEDDED_MODS:=$(C_MODS) $(CC_MODS) else LOADABLE_MODS:=$(C_MODS) $(CC_MODS) |