Index: asterisk/Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.205
diff -u -r1.205 Makefile
--- asterisk/Makefile	14 Sep 2005 01:10:20 -0000	1.205
+++ asterisk/Makefile	14 Sep 2005 17:19:44 -0000
@@ -226,8 +226,12 @@
   ASTCFLAGS+=-fsigned-char
 endif
 
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
-  ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/include/osp
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h),)
+  ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/local/include/osp
+else
+  ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
+    ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/include/osp
+  endif
 endif
 
 ifeq (${OSARCH},FreeBSD)
Index: asterisk/apps/Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/Makefile,v
retrieving revision 1.110
diff -u -r1.110 Makefile
--- asterisk/apps/Makefile	31 Aug 2005 21:29:58 -0000	1.110
+++ asterisk/apps/Makefile	14 Sep 2005 17:19:44 -0000
@@ -47,7 +47,7 @@
   APPS+=app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so
 endif
 
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
 APPS+=app_osplookup.so
 endif
 
Index: asterisk/res/Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/res/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- asterisk/res/Makefile	30 Aug 2005 02:54:02 -0000	1.23
+++ asterisk/res/Makefile	14 Sep 2005 17:19:44 -0000
@@ -23,9 +23,14 @@
   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)