From 1337877b9285598078a11da293939e534efeac8b Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sat, 5 Jan 2013 00:49:33 +0100 Subject: [PATCH] Fixed building the PDO pseudo-engine --- src/engines/Makefile | 6 +++--- src/engines/project.conf | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/engines/Makefile b/src/engines/Makefile index d77bc77..b106a58 100644 --- a/src/engines/Makefile +++ b/src/engines/Makefile @@ -19,8 +19,8 @@ INSTALL = install all: $(TARGETS) pdo_OBJS = pdo.o -pdo_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) -pdo_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) +pdo_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libSystem` +pdo_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --cflags libSystem` pdo.so: $(pdo_OBJS) $(CCSHARED) -o pdo.so $(pdo_OBJS) $(pdo_LDFLAGS) @@ -54,7 +54,7 @@ template.so: $(template_OBJS) $(CCSHARED) -o template.so $(template_OBJS) $(template_LDFLAGS) pdo.o: pdo.c ../../include/Database/database.h ../../config.h - $(CC) $(pdo_CFLAGS) -c pdo.c + $(CC) -D PREFIX=\"$(PREFIX)\" $(pdo_CFLAGS) -c pdo.c pgsql.o: pgsql.c ../../include/Database/database.h $(CC) $(pgsql_CFLAGS) -c pgsql.c diff --git a/src/engines/project.conf b/src/engines/project.conf index 9ec91a1..23b434d 100644 --- a/src/engines/project.conf +++ b/src/engines/project.conf @@ -7,10 +7,13 @@ dist=Makefile [pdo] type=plugin sources=pdo.c +cflags=`pkg-config --cflags libSystem` +ldflags=`pkg-config --cflags libSystem` install=$(LIBDIR)/Database/engine [pdo.c] depends=../../include/Database/database.h,../../config.h +cppflags=-D PREFIX=\"$(PREFIX)\" [pgsql] type=plugin