[svn-commits] russell: branch 1.6.0 r111999 - in /branches/1.6.0: ./ Makefile

Mon Mar 31 12:15:22 CDT 2008

Author: russell
Date: Mon Mar 31 12:15:22 2008
New Revision: 111999

URL: http://svn.digium.com/view/asterisk?view=rev&rev=111999
Log:
Merged revisions 111998 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r111998 | russell | 2008-03-31 12:14:58 -0500 (Mon, 31 Mar 2008) | 7 lines

Ensure configure gets run on a clean checkout.

(closes issue #12197)
Reported by: juggie
Patches:
      12197.diff uploaded by juggie (license 24)

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/Makefile

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/Makefile?view=diff&rev=111999&r1=111998&r2=111999
==============================================================================

--- branches/1.6.0/Makefile (original)
+++ branches/1.6.0/Makefile Mon Mar 31 12:15:22 2008
@@ -829,7 +829,7 @@
 menuselect/gmenuselect: menuselect/makeopts
 	$(MAKE_MENUSELECT) gmenuselect
 
-menuselect/makeopts:
+menuselect/makeopts: makeopts
 	$(MAKE_MENUSELECT) makeopts
 
 menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml build_tools/cflags-devmode.xml sounds/sounds.xml build_tools/embed_modules.xml configure


