Merged revisions 280624 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Mon, 2 Aug 2010 14:28:29 +0000 (14:28 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Mon, 2 Aug 2010 14:28:29 +0000 (14:28 +0000)
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.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@280626 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/Makefile

index 8175f1e..b18d1a0 100644 (file)
@@ -26,7 +26,7 @@ OBJS=$(filter-out $(OBJSFILTER),$(SRC:.c=.o))
 # 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