summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorrussell <russell@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2006-08-14 01:55:06 +0000
committerrussell <russell@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2006-08-14 01:55:06 +0000
commit8f90c084804ef50891accaa97a3df11a43dce959 (patch)
treea2d50ca17b3028585473050eb95f6cbfed43fa80 /Makefile
parent44190a002ec859520bf3cff678f9438c76a4e459 (diff)
don't try to include menuselect.makeopts or makeopts if the target is clean,
distclean, or update (fixes issue #7723) git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1302 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 09d8954..8260f62 100644
--- a/Makefile
+++ b/Makefile
@@ -68,12 +68,16 @@ endif
GLOBAL_MAKEOPTS=$(wildcard /etc/zaptel.makeopts)
USER_MAKEOPTS=$(wildcard ~/.zaptel.makeopts)
-ifneq ($(wildcard menuselect.makeopts),)
+ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
+ ifneq ($(wildcard menuselect.makeopts),)
include menuselect.makeopts
+ endif
endif
-ifneq ($(wildcard makeopts),)
+ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
+ ifneq ($(wildcard makeopts),)
include makeopts
+ endif
endif
#