summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/findoidjoins/Makefile6
-rw-r--r--contrib/mSQL-interface/Makefile6
-rw-r--r--contrib/odbc/Makefile6
-rw-r--r--contrib/pg_dumplo/Makefile8
-rw-r--r--contrib/pgbench/Makefile6
-rw-r--r--contrib/vacuumlo/Makefile6
6 files changed, 19 insertions, 19 deletions
diff --git a/contrib/findoidjoins/Makefile b/contrib/findoidjoins/Makefile
index 68ebf72c43..0c43051c7b 100644
--- a/contrib/findoidjoins/Makefile
+++ b/contrib/findoidjoins/Makefile
@@ -1,13 +1,13 @@
#
-# $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/Makefile,v 1.8 2000/07/09 13:13:03 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/Makefile,v 1.9 2000/08/31 16:08:59 petere Exp $
#
subdir = contrib/findoidjoins
top_builddir = ../..
include ../../src/Makefile.global
-CFLAGS += -I$(LIBPGEASYDIR) -I$(LIBPQDIR)
-LIBS += $(LIBPGEASY)
+CFLAGS += -I$(libpgeasy_srcdir) -I$(libpq_srcdir)
+LIBS += $(libpgeasy)
all: findoidjoins
diff --git a/contrib/mSQL-interface/Makefile b/contrib/mSQL-interface/Makefile
index cbebcef929..23d866dd1c 100644
--- a/contrib/mSQL-interface/Makefile
+++ b/contrib/mSQL-interface/Makefile
@@ -1,17 +1,17 @@
#
-# $Header: /cvsroot/pgsql/contrib/mSQL-interface/Attic/Makefile,v 1.4 2000/07/09 13:13:17 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/mSQL-interface/Attic/Makefile,v 1.5 2000/08/31 16:09:00 petere Exp $
#
subdir = contrib/mSQL-interface
top_builddir = ../..
-include ../../src/Makefile.global
+include $(top_builddir)/src/Makefile.global
NAME := mpgsql
SO_MAJOR_VERSION := 0
SO_MINOR_VERSION := 0
OBJS := mpgsql.o
-CFLAGS += -I$(LIBPQDIR)
+CFLAGS += -I$(libpq_srcdir)
include $(top_srcdir)/src/Makefile.shlib
diff --git a/contrib/odbc/Makefile b/contrib/odbc/Makefile
index b9922c486a..e81f51f215 100644
--- a/contrib/odbc/Makefile
+++ b/contrib/odbc/Makefile
@@ -1,9 +1,9 @@
# ODBC extensions
# Thomas Lockhart 2000-04-03
-SRCDIR= ../../src
-
-include $(SRCDIR)/Makefile.global
+subdir = contrib/odbc
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
ifndef PGLIB
PGLIB= .
diff --git a/contrib/pg_dumplo/Makefile b/contrib/pg_dumplo/Makefile
index 569339cbb6..f9d534508e 100644
--- a/contrib/pg_dumplo/Makefile
+++ b/contrib/pg_dumplo/Makefile
@@ -1,5 +1,5 @@
#
-# $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/Makefile,v 1.5 2000/07/09 13:13:24 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/Makefile,v 1.6 2000/08/31 16:09:05 petere Exp $
#
subdir = contrib/pg_dumplo
@@ -7,12 +7,12 @@ top_builddir = ../..
include ../../src/Makefile.global
OBJS = main.o lo_export.o lo_import.o utils.o
-CFLAGS += -I$(LIBPQDIR)
+CFLAGS += -I$(libpq_srcdir)
all: pg_dumplo
-pg_dumplo: $(OBJS) $(LIBPQDIR)/libpq.a
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPQ)
+pg_dumplo: $(OBJS) $(libpq_builddir)/libpq.a
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(libpq)
install: all installdirs
$(INSTALL_PROGRAM) pg_dumplo$(X) $(bindir)
diff --git a/contrib/pgbench/Makefile b/contrib/pgbench/Makefile
index 8db147cce7..64eeeb701b 100644
--- a/contrib/pgbench/Makefile
+++ b/contrib/pgbench/Makefile
@@ -1,13 +1,13 @@
#
-# $Header: /cvsroot/pgsql/contrib/pgbench/Makefile,v 1.5 2000/07/09 13:13:29 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/pgbench/Makefile,v 1.6 2000/08/31 16:09:09 petere Exp $
#
subdir = contrib/pgbench
top_builddir = ../..
include ../../src/Makefile.global
-CFLAGS += -I$(LIBPQDIR)
-LIBS += $(LIBPQ)
+CFLAGS += -I$(libpq_srcdir)
+LIBS += $(libpq)
all: pgbench
diff --git a/contrib/vacuumlo/Makefile b/contrib/vacuumlo/Makefile
index fefa2ef41e..85961d090a 100644
--- a/contrib/vacuumlo/Makefile
+++ b/contrib/vacuumlo/Makefile
@@ -1,13 +1,13 @@
#
-# $Header: /cvsroot/pgsql/contrib/vacuumlo/Makefile,v 1.6 2000/07/09 13:13:55 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/vacuumlo/Makefile,v 1.7 2000/08/31 16:09:12 petere Exp $
#
subdir = contrib/vacuumlo
top_builddir = ../..
include ../../src/Makefile.global
-CPPFLAGS += -I$(LIBPQDIR)
-LIBS += $(LIBPQ)
+CPPFLAGS += -I$(libpq_srcdir)
+LIBS += $(libpq)
all: vacuumlo