[svn-commits] tilghman: trunk r280629 - in /trunk: ./ main/Makefile

[SVN commits to the Digium repositories]

Author: tilghman
Date: Mon Aug  2 09:42:38 2010
New Revision: 280629

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=280629
Log:
Merged revisions 280628 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r280628 | tilghman | 2010-08-02 09:41:46 -0500 (Mon, 02 Aug 2010) | 2 lines
  
  Make this a little more deterministic... we want the latest value, not just a 1 somewhere.
........

Modified:
    trunk/   (props changed)
    trunk/main/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/main/Makefile?view=diff&rev=280629&r1=280628&r2=280629
==============================================================================
--- trunk/main/Makefile (original)
+++ trunk/main/Makefile Mon Aug  2 09:42:38 2010
@@ -26,7 +26,7 @@
 # otherwise modules will not have them available if none of the static
 # objects use it.
 OBJS+=stdtime/localtime.o
-ifneq ($(findstring 1,$(WEAKREF)),1)
+ifneq ($(firstword $(subst :, ,$(WEAKREF))),1)
 OBJS+=../res/res_adsi.o
 endif