summaryrefslogtreecommitdiff
path: root/src/interfaces/libpgeasy/Makefile
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2001-02-20 19:20:30 +0000
committerPeter Eisentraut <peter_e@gmx.net>2001-02-20 19:20:30 +0000
commitcb6edf9d56019a1a3d9fd3df0dfe4a3ca1e7daab (patch)
treefa108600dcddc1d1c70ae452dcb7111bae91f3df /src/interfaces/libpgeasy/Makefile
parentc4a9023d520d8b9dee8bed396d08a0bf801726e2 (diff)
downloadpostgresql-cb6edf9d56019a1a3d9fd3df0dfe4a3ca1e7daab.tar.gz
Make sure -L and -I's for our source tree are always before system include
or library directories on the command line.
Diffstat (limited to 'src/interfaces/libpgeasy/Makefile')
-rw-r--r--src/interfaces/libpgeasy/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/interfaces/libpgeasy/Makefile b/src/interfaces/libpgeasy/Makefile
index e8e107eb16..a550165701 100644
--- a/src/interfaces/libpgeasy/Makefile
+++ b/src/interfaces/libpgeasy/Makefile
@@ -2,7 +2,7 @@
#
# Makefile for src/interfaces/libpgeasy
#
-# $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/Makefile,v 1.5 2000/10/31 14:37:25 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/Makefile,v 1.6 2001/02/20 19:20:29 petere Exp $
#
#-------------------------------------------------------------------------
@@ -16,16 +16,16 @@ NAME= pgeasy
SO_MAJOR_VERSION= 2
SO_MINOR_VERSION= 1
-override CPPFLAGS += -I$(libpq_srcdir)
+override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
OBJS= libpgeasy.o halt.o
-SHLIB_LINK+= $(libpq)
+SHLIB_LINK = $(libpq)
# If crypt is a separate library, rather than part of libc, it may need
# to be referenced separately to keep (broken) linkers happy. (This is
# braindead; users of libpq should not need to know what it depends on.)
-SHLIB_LINK+= $(filter -lcrypt, $(LIBS))
+SHLIB_LINK+= $(filter -L%, $(LDFLAGS)) $(filter -lcrypt, $(LIBS))
all: all-lib