From 78b364c4fcb5fde82f0c00643338de6e825df9c6 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Wed, 17 Jul 2013 00:51:12 +0200 Subject: [PATCH] No longer using `pg_config --libs` to build the PostgreSQL plug-in (it is wrong) --- src/engines/Makefile | 2 +- src/engines/project.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/engines/Makefile b/src/engines/Makefile index 9113c89..ee5de8d 100644 --- a/src/engines/Makefile +++ b/src/engines/Makefile @@ -27,7 +27,7 @@ pdo.so: $(pdo_OBJS) pgsql_OBJS = pgsql.o pgsql_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) -I `pg_config --includedir` $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libSystem` -pgsql_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --cflags libSystem` -L `pg_config --libdir` -Wl,-rpath,`pg_config --libdir` `pg_config --libs` -lpq +pgsql_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --cflags libSystem` -L `pg_config --libdir` -Wl,-rpath,`pg_config --libdir` -lpq pgsql.so: $(pgsql_OBJS) $(CCSHARED) -o pgsql.so $(pgsql_OBJS) $(pgsql_LDFLAGS) diff --git a/src/engines/project.conf b/src/engines/project.conf index d7729ab..9a10bb1 100644 --- a/src/engines/project.conf +++ b/src/engines/project.conf @@ -19,7 +19,7 @@ cppflags=-D PREFIX=\"$(PREFIX)\" type=plugin cppflags=-I `pg_config --includedir` cflags=`pkg-config --cflags libSystem` -ldflags=`pkg-config --cflags libSystem` -L `pg_config --libdir` -Wl,-rpath,`pg_config --libdir` `pg_config --libs` -lpq +ldflags=`pkg-config --cflags libSystem` -L `pg_config --libdir` -Wl,-rpath,`pg_config --libdir` -lpq sources=pgsql.c install=$(LIBDIR)/Database/engine