diff options
| -rwxr-xr-x | Makefile | 8 | ||||
| -rwxr-xr-x | apps/Makefile | 2 | ||||
| -rwxr-xr-x | res/Makefile | 9 |
3 files changed, 14 insertions, 5 deletions
@@ -226,8 +226,12 @@ ifeq ($(PROC),ppc) 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) diff --git a/apps/Makefile b/apps/Makefile index 1de3db955..5bc26a91a 100755 --- a/apps/Makefile +++ b/apps/Makefile @@ -47,7 +47,7 @@ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard 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 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) |