$NetBSD: patch-ae,v 1.4 2009/01/26 13:15:49 jnemeth Exp $ --- apps/Makefile.orig 2006-04-30 06:38:22.000000000 -0700 +++ apps/Makefile @@ -45,21 +45,23 @@ APPS=app_dial.so app_playback.so app_voi #APPS+=app_rpt.so ifndef WITHOUT_ZAPTEL -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),) +ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(PREFIX)/include/zaptel.h),) APPS+=app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so app_page.so endif endif # WITHOUT_ZAPTEL -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),) +ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(PREFIX)/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),) APPS+=app_osplookup.so endif +CFLAGS+=-I$(CROSS_COMPILE_TARGET)/$(PREFIX)/include -L$(CROSS_COMPILE_TARGET)/$(PREFIX)/lib + ifeq ($(findstring BSD,${OSARCH}),BSD) CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib endif -CURLLIBS=$(shell $(CROSS_COMPILE_BIN)curl-config --libs) -ifneq ($(shell if [[ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]]; then echo "OK" ; fi),) +CURLLIBS=$(shell $(PREFIX)/bin/curl-config --libs) +ifneq ($(shell if [ `$(PREFIX)/bin/curl-config --vernum` -ge 70907 ]; then echo "OK" ; fi),) ifneq (${CURLLIBS},) APPS+=app_curl.so endif @@ -103,10 +105,10 @@ app_curl.so: app_curl.o $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CURLLIBS) app_sql_postgres.o: app_sql_postgres.c - $(CC) -pipe -I$(CROSS_COMPILE_TARGET)/usr/local/pgsql/include -I$(CROSS_COMPILE_TARGET)/usr/include/postgresql $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c + $(CC) -pipe -I$(CROSS_COMPILE_TARGET)/${PREFIX}/include $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c app_sql_postgres.so: app_sql_postgres.o - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -L/usr/local/pgsql/lib -lpq + $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -L${PREFIX}/lib -lpq app_sql_odbc.so: app_sql_odbc.o $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc