diff options
author | Matt Jordan <mjordan@digium.com> | 2015-04-15 13:36:09 -0500 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-04-15 13:36:09 -0500 |
commit | 97f83c4c537171eb739c9429221516816484ede8 (patch) | |
tree | cd5654b327b4d171347d1f8e644f2094e5d60ed8 | |
parent | abd56db3e07d8177a124958dea412669450b67fa (diff) | |
parent | 222fbe1d9ad76897e1c91faefff53379f45c3983 (diff) |
Merge "Build System: Replace comment about setting menuselect defaults." into 13
-rw-r--r-- | Makefile | 25 |
1 files changed, 16 insertions, 9 deletions
@@ -154,14 +154,21 @@ LINKER_SYMBOL_PREFIX= # Default install directory for DAHDI hooks. DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/span_config.d -# If the file .asterisk.makeopts is present in your home directory, you can -# include all of your favorite menuselect options so that every time you download -# a new version of Asterisk, you don't have to run menuselect to set them. -# The file /etc/asterisk.makeopts will also be included but can be overridden -# by the file in your home directory. +# This Makefile previously contained a note about the ability to use .asterisk.makeopts +# from your home directory or /etc/asterisk.makeopts to set defaults for menuselect. +# These files have never worked in this branch of Asterisk. The work around is to +# manually copy the file containing defaults before running 'make menuselect': +# +# cp ${HOME}/.asterisk.makeopts menuselect.makeopts +# or +# cp /etc/asterisk.makeopts menuselect.makeopts +# +# As an alternative, menuselect/menuselect can be used by a script to enable or disable +# individual options or entire categories. To use this feature you must first +# compile menuselect using 'make menuselect.makeopts'. For information about parameters +# supported run: +# menuselect/menuselect --help -GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts) -USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts) MOD_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include" OTHER_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include" @@ -332,10 +339,10 @@ makeopts: configure @echo "****" @exit 1 -menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts build_tools/menuselect-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) +menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts build_tools/menuselect-deps ifeq ($(filter %menuselect,$(MAKECMDGOALS)),) menuselect/menuselect --check-deps $@ - menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) + menuselect/menuselect --check-deps $@ endif $(MOD_SUBDIRS_EMBED_LDSCRIPT): |