kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-20 16:50:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Build System: Enable use of ~/.asterisk.makeopts and /etc/asterisk.makeopts."

Browse Source
This commit is contained in:
Matt Jordan
2015-04-15 21:26:24 -05:00
committed by Gerrit Code Review
parent 043c38f6de abf10a1d4c
commit ab38353892
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@@ -160,8 +160,14 @@ DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/span_config.d
# The file /etc/asterisk.makeopts will also be included but can be overridden # The file /etc/asterisk.makeopts will also be included but can be overridden
# by the file in your home directory. # by the file in your home directory.
GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts) ifeq ($(wildcard menuselect.makeopts),)
USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts) USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
else
USER_MAKEOPTS=
GLOBAL_MAKEOPTS=
endif
MOD_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include" MOD_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
OTHER_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include" OTHER_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
@@ -333,7 +339,7 @@ makeopts: configure
@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 $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
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 $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
endif endif