diff options
| author | file <file@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-02-26 15:18:51 +0000 |
|---|---|---|
| committer | file <file@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-02-26 15:18:51 +0000 |
| commit | 8ec3008f491ae80389a345ebc4c0463cc203df58 (patch) | |
| tree | f723ddbdba4d79138ccf84933704a4392ecd8116 /Makefile | |
| parent | bf9e7142b445c069a7d22231c94048fe7c8d9e02 (diff) | |
Merged revisions 2230 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4
........
r2230 | file | 2007-02-26 10:16:46 -0500 (Mon, 26 Feb 2007) | 2 lines
Move menuselect build options inclusion to before it is initially used otherwise the needed variables may not be present at time of use. (issue #9145 reported by jmls)
........
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@2231 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 42 |
1 files changed, 21 insertions, 21 deletions
@@ -56,27 +56,6 @@ ifeq ($(KVERS_MAJ),2.4) endif endif -# If the file .zaptel.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/zaptel.makeopts will also be included but can be overridden -# by the file in your home directory. - -GLOBAL_MAKEOPTS=$(wildcard /etc/zaptel.makeopts) -USER_MAKEOPTS=$(wildcard ~/.zaptel.makeopts) - -ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),) - ifneq ($(wildcard menuselect.makeopts),) - include menuselect.makeopts - endif -endif - -ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),) - ifneq ($(wildcard makeopts),) - include makeopts - endif -endif - # # Features are now configured in zconfig.h # @@ -130,6 +109,27 @@ LTZ_SO_OBJS:=zonedata.lo tonezone.lo LTZ_SO_MAJOR_VER:=1 LTZ_SO_MINOR_VER:=0 +# If the file .zaptel.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/zaptel.makeopts will also be included but can be overridden +# by the file in your home directory. + +GLOBAL_MAKEOPTS=$(wildcard /etc/zaptel.makeopts) +USER_MAKEOPTS=$(wildcard ~/.zaptel.makeopts) + +ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),) + ifneq ($(wildcard menuselect.makeopts),) + include menuselect.makeopts + endif +endif + +ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),) + ifneq ($(wildcard makeopts),) + include makeopts + endif +endif + MODULES:=pciradio tor2 torisa wcfxo wct1xxp wctdm wctdm24xxp wcte11xp wcusb zaptel ztd-eth ztd-loc ztdummy ztdynamic zttranscode MODULES:=$(filter-out $(MENUSELECT_MODULES),$(MODULES)) MODULE_ALIASES=wcfxs wctdm8xxp wct2xxp |