[zaptel-commits] file: branch 1.4 r2230 - /branches/1.4/Makefile

[zaptel-commits at lists.digium.com]

Author: file
Date: Mon Feb 26 09:16:46 2007
New Revision: 2230

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2230
Log:
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:
    branches/1.4/Makefile

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/Makefile?view=diff&rev=2230&r1=2229&r2=2230
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Mon Feb 26 09:16:46 2007
@@ -64,6 +64,27 @@
 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
+
 ifeq ($(BUILDVER),linux24)
 MENUSELECT_MODULES+=xpp wctc4xxp zttranscode
 endif
@@ -133,27 +154,6 @@
   ifneq (,$(findstring x86_64,$(UNAME_M)))
     KFLAGS+=-mcmodel=kernel
   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
 
 #