[svn-commits] branch mogorman/asterisk-xmpp r8662 - /team/mogorman/asterisk-xmpp/res/Makefile

[svn-commits at lists.digium.com]

Author: mogorman
Date: Wed Jan 25 11:42:25 2006
New Revision: 8662

URL: http://svn.digium.com/view/asterisk?rev=8662&view=rev
Log:
stupid automerge

Modified:
    team/mogorman/asterisk-xmpp/res/Makefile

Modified: team/mogorman/asterisk-xmpp/res/Makefile
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/res/Makefile?rev=8662&r1=8661&r2=8662&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/res/Makefile (original)
+++ team/mogorman/asterisk-xmpp/res/Makefile Wed Jan 25 11:42:25 2006
@@ -56,11 +56,11 @@
 
 ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/iksemel.h),)
   MODS+=res_xmpp.so
-  OSPLIB=$(CROSS_COMPILE_TARGET)/usr/local/lib/libiksemel.a
+  XMPPLIB=$(CROSS_COMPILE_TARGET)/usr/local/lib/libiksemel.a
   else
      ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/iksemel.h),)
        MODS+=res_xmpp.so
-       OSPLIB=$(CROSS_COMPILE_TARGET)/usr/lib/libiksemel.a
+       XMPPLIB=$(CROSS_COMPILE_TARGET)/usr/lib/libiksemel.a
      endif
   endif