[svn-commits] branch group/autoconf_and_menuselect r18442 - /team/group/autoconf_and_menuse...

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Fri Apr  7 17:33:32 2006
New Revision: 18442

URL: http://svn.digium.com/view/asterisk?rev=18442&view=rev
Log:
change the way global/user options work, so that they feed into menuselect instead of directly into the Makefile

Modified:
    team/group/autoconf_and_menuselect/Makefile

Modified: team/group/autoconf_and_menuselect/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/Makefile?rev=18442&r1=18441&r2=18442&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/Makefile (original)
+++ team/group/autoconf_and_menuselect/Makefile Fri Apr  7 17:33:32 2006
@@ -177,18 +177,13 @@
 #ASTCFLAGS+=-DOLD_DSP_ROUTINES
 
 # If the file .asterisk.makeopts is present in your home directory, you can
-# include all of your favorite Makefile options so that every time you download
-# a new version of Asterisk, you don't have to edit the makefile to set them. 
-# The file, /etc/asterisk.makeopts will also be included, but can be overridden
+# 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/asterisk.makeopts will also be included but can be overridden
 # by the file in your home directory.
 
-ifneq ($(wildcard /etc/asterisk.makeopts),)
-  include /etc/asterisk.makeopts
-endif
-
-ifneq ($(wildcard ~/.asterisk.makeopts),)
-  include ~/.asterisk.makeopts
-endif
+GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
+USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
 
 ifneq ($(wildcard menuselect.makeopts),)
   include menuselect.makeopts
@@ -449,7 +444,7 @@
 	@echo " + cannot be run before being installed by   +"  
 	@echo " + running:                                  +"  
 	@echo " +                                           +"
-	@echo " +               $(MAKE) install                +"  
+	@echo " +               make install                +"  
 	@echo " +-------------------------------------------+"  
 
 all: cleantest configure include/autoconfig.h menuselect.makeopts depend asterisk subdirs
@@ -463,7 +458,7 @@
 	@exit 1
 
 menuselect.makeopts: build_tools/menuselect makeopts.xml
-	@build_tools/menuselect --check-deps
+	@build_tools/menuselect --check-deps ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} $@
 
 #ifneq ($(wildcard tags),)
 ctags: tags
@@ -990,7 +985,7 @@
 	rm -rf $(DESTDIR)$(ASTLOGDIR)
 
 menuselect: build_tools/menuselect makeopts.xml
-	- at ./build_tools/menuselect && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
+	- at ./build_tools/menuselect ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
 
 build_tools/menuselect: mxml/libmxml.a
 	$(MAKE) -C build_tools menuselect