From 80fb221f10135c73846365e234fd66a8a834d6e5 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Fri, 28 Oct 2005 23:53:07 +0000 Subject: [PATCH] find OSP toolkit library properly git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6887 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/Makefile | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/res/Makefile b/res/Makefile index 47e0c4f9bc..d02021aed5 100755 --- a/res/Makefile +++ b/res/Makefile @@ -27,13 +27,23 @@ ifneq ($(NOCRYPTO),yes) MODS+=res_crypto.so endif -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h),) +ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libosptk.a),) MODS+=res_osp.so - OSPLIB=$(CROSS_COMPILE_TARGET)/usr/local/lib/libosptk.a + OSPLIB=$(CROSS_COMPILE_TARGET)/usr/lib/libosptk.a else - ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),) + ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libosptk.a),) MODS+=res_osp.so - OSPLIB=$(CROSS_COMPILE_TARGET)/usr/lib/libosp.a + OSPLIB=$(CROSS_COMPILE_TARGET)/usr/local/lib/libosptk.a + endif +endif + +ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libosp.a),) + MODS+=res_osp.so + OSPLIB=$(CROSS_COMPILE_TARGET)/usr/lib/libosp.a +else + ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libosp.a),) + MODS+=res_osp.so + OSPLIB=$(CROSS_COMPILE_TARGET)/usr/local/lib/libosp.a endif endif