[asterisk-commits] tilghman: trunk r280626 - in /trunk: ./ main/Makefile

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Aug  2 09:28:29 2010
New Revision: 280626

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

........
  r280624 | tilghman | 2010-08-02 09:27:20 -0500 (Mon, 02 Aug 2010) | 2 lines
  
  Apparently, the values in makeopts are sometimes 1:1 and sometimes 1.  Compensate for this.
........

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=280626&r1=280625&r2=280626
==============================================================================
--- trunk/main/Makefile (original)
+++ trunk/main/Makefile Mon Aug  2 09:28:29 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 ($(WEAKREF),1:1)
+ifneq ($(findstring 1,$(WEAKREF)),1)
 OBJS+=../res/res_adsi.o
 endif