[svn-commits] twilson: trunk r438 - in /trunk: ./ Makefile

[SVN commits to the Digium repositories]

Author: twilson
Date: Wed Dec 10 16:00:19 2008
New Revision: 438

URL: http://svn.digium.com/view/menuselect?view=rev&rev=438
Log:
Merged revisions 437 via svnmerge from 
https://origsvn.digium.com/svn/menuselect/branches/1.0

........
  r437 | twilson | 2008-12-10 15:54:49 -0600 (Wed, 10 Dec 2008) | 8 lines
  
  Make menuselect stop executing configure when running "make clean"
  
  (closes issue #13869)
  Reported by: oej
  Patches: 
        menuselect_makefile.diff.txt uploaded by otherwiseguy (license 396)
  Tested by: putnopvut, otherwiseguy
........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.0-merged (original)
+++ branch-1.0-merged Wed Dec 10 16:00:19 2008
@@ -1,1 +1,1 @@
-/branches/1.0:1-316,383
+/branches/1.0:1-316,383,437

Modified: trunk/Makefile
URL: http://svn.digium.com/view/menuselect/trunk/Makefile?view=diff&rev=438&r1=437&r2=438
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Dec 10 16:00:19 2008
@@ -11,8 +11,12 @@
 # the GNU General Public License
 #
 
-# read local makeopts settings
--include makeopts
+# even though we could use '-include makeopts' here, use a wildcard
+# lookup anyway, so that make won't try to build makeopts if it doesn't
+# exist (other rules will force it to be built if needed)
+ifneq ($(wildcard makeopts),)
+  include makeopts
+endif
 
 .PHONY: clean dist-clean distclean test ntest ctest gtest