From: Kevin P. Fleming Date: Tue, 30 Aug 2005 15:59:25 +0000 (+0000) Subject: fix cdr_pgsql build on Debian testing (issue #5064) X-Git-Tag: 1.2.0-beta2~459 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a90915e4e914ec040cfd3c059b49328ed8ee7f5c;p=thirdparty%2Fasterisk.git fix cdr_pgsql build on Debian testing (issue #5064) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6453 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/cdr/Makefile b/cdr/Makefile index 4aeac027b8..f213caf1d0 100755 --- a/cdr/Makefile +++ b/cdr/Makefile @@ -46,12 +46,17 @@ endif # # PGSQL stuff... Autoconf anyone?? # -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),) +ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),) MODS+=cdr_pgsql.so endif MLFLAGS= +ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql),) + CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/include/postgresql + MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/lib/postgresql +endif + ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include),) CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/pgsql/include MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/local/pgsql/lib