summaryrefslogtreecommitdiff
path: root/src/bin/pg_dump/Makefile
diff options
context:
space:
mode:
authorPeter Eisentraut2001-02-20 19:20:30 +0000
committerPeter Eisentraut2001-02-20 19:20:30 +0000
commitcb6edf9d56019a1a3d9fd3df0dfe4a3ca1e7daab (patch)
treefa108600dcddc1d1c70ae452dcb7111bae91f3df /src/bin/pg_dump/Makefile
parentc4a9023d520d8b9dee8bed396d08a0bf801726e2 (diff)
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/pg_dump/Makefile')
-rw-r--r--src/bin/pg_dump/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile
index 95061730874..406816a1346 100644
--- a/src/bin/pg_dump/Makefile
+++ b/src/bin/pg_dump/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/pg_dump/Makefile,v 1.28 2001/02/18 18:33:59 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.29 2001/02/20 19:20:28 petere Exp $
#
#-------------------------------------------------------------------------
@@ -16,15 +16,15 @@ include $(top_builddir)/src/Makefile.global
OBJS= pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o pg_backup_files.o \
pg_backup_null.o pg_backup_tar.o $(STRDUP)
-override CPPFLAGS+= -I$(libpq_srcdir)
+override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
all: submake pg_dump pg_restore pg_dumpall
pg_dump: pg_dump.o common.o $(OBJS) $(libpq_builddir)/libpq.a
- $(CC) $(CFLAGS) $(LDFLAGS) pg_dump.o common.o $(OBJS) $(libpq) $(LIBS) -o $@
+ $(CC) $(CFLAGS) pg_dump.o common.o $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@
pg_restore: pg_restore.o $(OBJS) $(libpq_builddir)/libpq.a
- $(CC) $(CFLAGS) $(LDFLAGS) pg_restore.o $(OBJS) $(libpq) $(LIBS) -o $@
+ $(CC) $(CFLAGS) pg_restore.o $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@
../../utils/strdup.o:
$(MAKE) -C ../../utils strdup.o