[svn-commits] file: trunk r2231 - in /trunk: ./ Makefile

[svn-commits at lists.digium.com]

Author: file
Date: Mon Feb 26 09:18:51 2007
New Revision: 2231

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2231
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?view=diff&rev=2231&r1=2230&r2=2231
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Mon Feb 26 09:18:51 2007
@@ -56,27 +56,6 @@
   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
 #
@@ -129,6 +108,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))