summaryrefslogtreecommitdiff
path: root/src/bin/psql/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/bin/psql/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/bin/psql/Makefile')
-rw-r--r--src/bin/psql/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile
index 82333e5001..0d0d0ec9e9 100644
--- a/src/bin/psql/Makefile
+++ b/src/bin/psql/Makefile
@@ -5,7 +5,7 @@
# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
#
-# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.28 2001/02/18 18:34:01 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.29 2001/02/20 19:20:29 petere Exp $
#
#-------------------------------------------------------------------------
@@ -15,7 +15,7 @@ include $(top_builddir)/src/Makefile.global
REFDOCDIR= $(top_srcdir)/doc/src/sgml/ref
-override CPPFLAGS+= -I$(libpq_srcdir)
+override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
OBJS=command.o common.o help.o input.o stringutils.o mainloop.o \
copy.o startup.o prompt.o variables.o large_obj.o print.o describe.o \
@@ -49,7 +49,7 @@ endif
# End of hacks for picking up backend 'port' modules
psql: $(OBJS) $(libpq_builddir)/libpq.a
- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(libpq) $(LIBS) -o $@
+ $(CC) $(CFLAGS) $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@
help.o: $(srcdir)/sql_help.h