kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-15 00:41:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Build System: Replace comment about setting menuselect defaults." into 13

Browse Source
This commit is contained in:
Matt Jordan
2015-04-15 13:36:09 -05:00
committed by Gerrit Code Review
parent abd56db3e0 222fbe1d9a
commit 97f83c4c53
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Makefile
View File

@@ -154,14 +154,21 @@ LINKER_SYMBOL_PREFIX=
# Default install directory for DAHDI hooks. # Default install directory for DAHDI hooks.
DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/span_config.d DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/span_config.d
# If the file .asterisk.makeopts is present in your home directory, you can # This Makefile previously contained a note about the ability to use .asterisk.makeopts
# include all of your favorite menuselect options so that every time you download # from your home directory or /etc/asterisk.makeopts to set defaults for menuselect.
# a new version of Asterisk, you don't have to run menuselect to set them. # These files have never worked in this branch of Asterisk. The work around is to
# The file /etc/asterisk.makeopts will also be included but can be overridden # manually copy the file containing defaults before running 'make menuselect':
# by the file in your home directory. #
# 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" MOD_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
OTHER_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include" OTHER_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
@@ -332,10 +339,10 @@ makeopts: configure
@echo "****" @echo "****"
@exit 1 @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)),) ifeq ($(filter %menuselect,$(MAKECMDGOALS)),)
menuselect/menuselect --check-deps $@ menuselect/menuselect --check-deps $@
menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect/menuselect --check-deps $@
endif endif
$(MOD_SUBDIRS_EMBED_LDSCRIPT): $(MOD_SUBDIRS_EMBED_LDSCRIPT):