aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2005-09-25 20:50:40 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2005-09-25 20:50:40 +0000
commit07a5d27c123ab038fda50d4d5db14af5d65a252f (patch)
treede7e0427d680bedbfb2bca933f4084c181e99380 /res
parent22c8583cbfeb069baed25cc2ffbd17ad73da2361 (diff)
support new version of OSP toolkit (issue #5168)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6653 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rwxr-xr-xres/Makefile9
1 files changed, 7 insertions, 2 deletions
diff --git a/res/Makefile b/res/Makefile
index 5804b2171..4386f05db 100755
--- a/res/Makefile
+++ b/res/Makefile
@@ -23,9 +23,14 @@ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CR
MODS+=res_odbc.so
endif
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h),)
MODS+=res_osp.so
- OSPLIB=$(CROSS_COMPILE_TARGET)/usr/lib/libosp.a
+ OSPLIB=$(CROSS_COMPILE_TARGET)/usr/local/lib/libosptk.a
+else
+ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
+ MODS+=res_osp.so
+ OSPLIB=$(CROSS_COMPILE_TARGET)/usr/lib/libosp.a
+ endif
endif
ifeq ($(findstring BSD,${OSARCH}),BSD)