[svn-commits] russell: branch 1.6.2 r269009 - in /branches/1.6.2: ./ Makefile.rules

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Jun  8 10:41:45 2010
New Revision: 269009

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

........
  r269008 | russell | 2010-06-08 10:41:23 -0500 (Tue, 08 Jun 2010) | 5 lines
  
  Ensure CONFIG_FLAGS makes it into the build rules when doing out of tree builds.
  
  (closes issue #16685)
  Reported by: pprindeville
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/Makefile.rules

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

Modified: branches/1.6.2/Makefile.rules
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/Makefile.rules?view=diff&rev=269009&r1=269008&r2=269009
==============================================================================
--- branches/1.6.2/Makefile.rules (original)
+++ branches/1.6.2/Makefile.rules Tue Jun  8 10:41:45 2010
@@ -47,6 +47,10 @@
     _ASTCFLAGS+=$(OPTIMIZE)
 else
     _ASTCFLAGS+=-O0
+endif
+
+ifeq ($(findstring $(CONFIG_CFLAGS),$(_ASTCFLAGS)),)
+    _ASTCFLAGS+=$(CONFIG_CFLAGS)
 endif
 
 # shortcuts for common combinations of flags; these must be recursively expanded so that