diff options
| author | Matt Jordan <mjordan@digium.com> | 2015-04-15 21:26:24 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-04-15 21:26:24 -0500 |
| commit | ab38353892cc823a37ed2b8db6de56ba58885e5f (patch) | |
| tree | 1821275b6c830b3bdb852062f71fc7ddb899b241 | |
| parent | 043c38f6de15caabfdc611f988210f2bb3a9b579 (diff) | |
| parent | abf10a1d4c010235a35b10097b1ee9f0ddeaff91 (diff) | |
Merge "Build System: Enable use of ~/.asterisk.makeopts and /etc/asterisk.makeopts."
| -rw-r--r-- | Makefile | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -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 # by the file in your home directory. -GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts) -USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts) +ifeq ($(wildcard menuselect.makeopts),) + USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts) + GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts) +else + USER_MAKEOPTS= + GLOBAL_MAKEOPTS= +endif + MOD_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include" OTHER_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include" @@ -333,7 +339,7 @@ makeopts: configure @exit 1 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 $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) endif |