Index: Makefile
===================================================================
--- Makefile	(revision 433548)
+++ Makefile	(working copy)
@@ -160,9 +160,18 @@
 # 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)
+LOCAL_MAKEOPTS=$(wildcard menuselect.makeopts)
+USER_MAKEOPTS=
+GLOBAL_MAKEOPTS=
 
+ifeq ($(LOCAL_MAKEOPTS),)
+	USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
+	ifeq ($(USER_MAKEOPTS),)
+		GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
+	endif
+endif
+
+
 MOD_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
 OTHER_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
 
@@ -333,7 +342,7 @@
 	@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