[svn-commits] russell: trunk r1302 - /trunk/Makefile

[svn-commits at lists.digium.com]

Author: russell
Date: Sun Aug 13 20:55:06 2006
New Revision: 1302

URL: http://svn.digium.com/view/zaptel?rev=1302&view=rev
Log:
don't try to include menuselect.makeopts or makeopts if the target is clean,
distclean, or update (fixes issue #7723)

Modified:
    trunk/Makefile

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=1302&r1=1301&r2=1302&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sun Aug 13 20:55:06 2006
@@ -68,12 +68,16 @@
 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
-
-ifneq ($(wildcard makeopts),)
+ endif
+endif
+
+ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
+ ifneq ($(wildcard makeopts),)
   include makeopts
+ endif
 endif
 
 #