25 files changed, 347 insertions, 757 deletions
diff --git a/contrib/Makefile b/contrib/Makefile
index 2a3b099afaf..bd7626ad88c 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -1,13 +1,12 @@
 #
 # The PostgreSQL contrib tree Makefile
 #
-#	Portions Copyright (c) 1999-2000, PostgreSQL, Inc
-#
-# $Header: /cvsroot/pgsql/contrib/Makefile,v 1.5 2000/06/19 13:52:59 momjian Exp $
+# $Header: /cvsroot/pgsql/contrib/Makefile,v 1.6 2000/07/09 13:12:57 petere Exp $
 #
 
-TOPDIR = ..
-include Makefile.global
+subdir = contrib
+top_builddir = ..
+include ../src/Makefile.global
 
 WANTED_DIRS =	array		\
 		earthdistance	\
@@ -25,34 +24,22 @@ WANTED_DIRS =	array		\
 		spi		\
 		string		\
 		tips		\
-		tools		\
 		unixdate	\
 		userlock	\
 		vacuumlo	
 	#	odbc
 
-
-all:
+all .DEFAULT:
 	for dir in $(WANTED_DIRS); do \
 	    if [ -e $$dir/Makefile ]; then \
 		$(MAKE) -C $$dir $@ ; \
 	    fi; \
 	done
 
-
 install:
-	../config/mkinstalldirs $(CONTRIB_BINDIR) $(CONTRIB_MODDIR) $(CONTRIB_DOCDIR) $(CONTRIB_SQLDIR) $(CONTRIB_EXAMPLESDIR)
-	for dir in $(WANTED_DIRS); do \
-	    if [ -e $$dir/Makefile ]; then \
-		$(MAKE) -C $$dir $@ ; \
-	    fi; \
-	done
-	$(INSTALL) $(INSTL_LIB_OPTS) Contrib.index $(CONTRIB_DOCDIR);
-
-
-.DEFAULT:
 	for dir in $(WANTED_DIRS); do \
 	    if [ -e $$dir/Makefile ]; then \
 		$(MAKE) -C $$dir $@ ; \
 	    fi; \
 	done
+	$(INSTALL_DATA) Contrib.index $(docdir)/contrib
diff --git a/contrib/Makefile.global b/contrib/Makefile.global
deleted file mode 100644
index f1efad49d1c..00000000000
--- a/contrib/Makefile.global
+++ /dev/null
@@ -1,44 +0,0 @@
-
-#-------------------------------------------------------------------------
-#
-# Makefile.global
-#    Build and install PostgreSQL contrib.
-#
-# Portions Copyright (c) 1999-2000, PostgreSQL, Inc
-#
-#
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/contrib/Attic/Makefile.global,v 1.2 2000/06/19 13:52:59 momjian Exp $
-#
-#-------------------------------------------------------------------------
-
-SRCDIR = $(TOPDIR)/src
-include $(SRCDIR)/Makefile.global 
-
-### --------------------------------------------------------- 
-### DELETE THIS PART if ../src/Makefile.global is standardize 
-###                  (has define all next definitions itself)
-
-DOCDIR=$(POSTDOCDIR)
-
-# not $PGDATA, but anything like '/usr/local/pgsql/share'
-DATADIR=$(LIBDIR)
-
-### ----------------------------------------------------------
-
-# execute-able
-CONTRIB_BINDIR 		= $(BINDIR)
-# *.so
-CONTRIB_MODDIR 		= $(LIBDIR)/modules
-# *.doc
-CONTRIB_DOCDIR		= $(DOCDIR)/contrib
-# *.sql
-CONTRIB_SQLDIR		= $(DATADIR)/sql
-# *.examples
-CONTRIB_EXAMPLESDIR	= $(CONTRIB_DOCDIR)/examples
-
-
-RM	= rm -f
-SED	= sed
-
-
diff --git a/contrib/array/Makefile b/contrib/array/Makefile
index e0717f08461..61f12fcfc97 100644
--- a/contrib/array/Makefile
+++ b/contrib/array/Makefile
@@ -1,54 +1,38 @@
 #
-# $Header: /cvsroot/pgsql/contrib/array/Attic/Makefile,v 1.11 2000/07/04 16:16:43 momjian Exp $
+# $Header: /cvsroot/pgsql/contrib/array/Attic/Makefile,v 1.12 2000/07/09 13:12:59 petere Exp $
 #
 
-TOPDIR=../..
+subdir = contrib/array
+top_builddir = ../..
+include ../../src/Makefile.global
 
-include ../Makefile.global
-
-NAME	= array_iterator
-
-PROGRAM	= 
-OBJS	= $(NAME).o
-DOCS	= README.$(NAME)
-SQLS	= $(NAME).sql
-BINS	=
-EXAMPLES=
-MODS	= $(NAME)$(DLSUFFIX)
+NAME	:= array_iterator
+SONAME	:= $(NAME)$(DLSUFFIX)
 
 CFLAGS += -I. $(CFLAGS_SL)
 
-OTHER_CLEAN = $(SQLS)
-
-all: $(MODS) $(SQLS)
+all: $(SONAME) $(NAME).sql
 
-%.sql: %.sql.in
-	$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@:.sql=$(DLSUFFIX))|" < $< > $@
+$(NAME).sql: $(NAME).sql.in
+	sed -e 's:MODULE_PATHNAME:$(libdir)/contrib/$(SONAME):g' < $< > $@
 
-install: install_doc install_sql install_mod 
+install: all installdirs
+	$(INSTALL_DATA) README.$(NAME)	$(docdir)/contrib
+	$(INSTALL_DATA) $(NAME).sql	$(datadir)/contrib
+	$(INSTALL_SHLIB) $(SONAME)	$(libdir)/contrib
 
-install_doc:
-	for inst_file in $(DOCS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
-	done
+installdirs:
+	$(mkinstalldirs) $(docdir)/contrib $(datadir)/contrib $(libdir)/contrib
 
-install_sql:
-	for inst_file in $(SQLS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
-	done
-
-install_mod:
-	for inst_file in $(MODS); do \
-		$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
-	done
+uninstall:
+	rm -rf $(docdir)/contrib/README.$(NAME) $(datadir)/contrib/$(NAME).sql $(libdir)/contrib/$(SONAME)
 
+clean distclean maintainer-clean:
+	rm -f $(SONAME) $(NAME).sql
 
 depend dep:
 	$(CC) -MM -MG $(CFLAGS) *.c > depend
 
-clean:
-	$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
-
 ifeq (depend,$(wildcard depend))
 include depend
 endif
diff --git a/contrib/earthdistance/Makefile b/contrib/earthdistance/Makefile
index c6a971f7c08..733f128b82b 100644
--- a/contrib/earthdistance/Makefile
+++ b/contrib/earthdistance/Makefile
@@ -1,53 +1,38 @@
 #
-# $Header: /cvsroot/pgsql/contrib/earthdistance/Makefile,v 1.5 2000/07/04 16:16:44 momjian Exp $
+# $Header: /cvsroot/pgsql/contrib/earthdistance/Makefile,v 1.6 2000/07/09 13:13:00 petere Exp $
 #
 
-TOPDIR=../..
+subdir = contrib/earthdistance
+top_builddir = ../..
+include ../../src/Makefile.global
 
-include ../Makefile.global
-
-NAME	= earthdistance
-
-PROGRAM	= 
-OBJS	= $(NAME).o
-DOCS	= README.$(NAME)
-SQLS	= $(NAME).sql
-BINS    =
-EXAMPLES=
-MODS	= $(NAME)$(DLSUFFIX)
+NAME	:= earthdistance
+SONAME	:= $(NAME)$(DLSUFFIX)
 
 CFLAGS += -I. $(CFLAGS_SL)
 
-OTHER_CLEAN = $(SQLS)
+all: $(SONAME) $(NAME).sql
 
-all: $(MODS) $(SQLS)
+$(NAME).sql: $(NAME).sql.in
+	sed -e 's:MODULE_PATHNAME:$(datadir)/contrib/$(SONAME):g' < $< > $@
 
-%.sql: %.sql.in
-	$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@:.sql=$(DLSUFFIX))|" < $< > $@
+install: all installdirs
+	$(INSTALL_SHLIB) $(SONAME)	$(libdir)/contrib
+	$(INSTALL_DATA) $(NAME).sql	$(datadir)/contrib
+	$(INSTALL_DATA) README.$(NAME)	$(docdir)/contrib
 
-install: install_doc install_sql install_mod
+installdirs:
+	$(mkinstalldirs) $(libdir)/contrib $(datadir)/contrib $(docdir)/contrib
 
-install_doc:
-	for inst_file in $(DOCS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
-	done
+uninstall:
+	rm -f $(libdir)/contrib/$(SONAME) $(datadir)/contrib/$(NAME).sql $(docdir)/contrib/README.$(NAME)
 
-install_sql:
-	for inst_file in $(SQLS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
-	done
-
-install_mod:
-	for inst_file in $(MODS); do \
-		$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
-	done
+clean distclean maintainer-clean:
+	rm -f $(SONAME) $(NAME).sql
 
 depend dep:
 	$(CC) -MM -MG $(CFLAGS) *.c > depend
 
-clean:
-	$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
-
 ifeq (depend,$(wildcard depend))
 include depend
 endif
diff --git a/contrib/findoidjoins/Makefile b/contrib/findoidjoins/Makefile
index 530e218d445..68ebf72c431 100644
--- a/contrib/findoidjoins/Makefile
+++ b/contrib/findoidjoins/Makefile
@@ -1,50 +1,26 @@
 #
-# $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/Makefile,v 1.7 2000/06/19 13:53:22 momjian Exp $
+# $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/Makefile,v 1.8 2000/07/09 13:13:03 petere Exp $
 #
 
-TOPDIR=../..
+subdir = contrib/findoidjoins
+top_builddir = ../..
+include ../../src/Makefile.global
 
-include ../Makefile.global
+CFLAGS	+= -I$(LIBPGEASYDIR) -I$(LIBPQDIR)
+LIBS	+= $(LIBPGEASY)
 
-NAME	= findoidjoins
+all: findoidjoins
 
-PROGRAM	= $(NAME)
-OBJS	= $(NAME).o
-DOCS	= README.$(NAME)
-SQLS	= 
-BINS    = $(PROGRAM) make_oidjoins_check
-EXAMPLES=
-MODS	= 
+install: all installdirs
+	$(INSTALL_PROGRAM) findoidjoins$(X)	$(bindir)
+	$(INSTALL_SCRIPT) make_oidjoins_check	$(bindir)
+	$(INSTALL_DATA) README.findoidjoins	$(docdir)/contrib
 
-CFLAGS += -I$(LIBPGEASYDIR) -I$(LIBPQDIR)
+installdirs:
+	$(mkinstalldirs) $(bindir) $(docdir)/contrib
 
-OTHER_CLEAN = 
+uninstall:
+	rm -f $(bindir)/findoidjoins$(X) $(bindir)/make_oidjoins_check $(docdir)/contrib/README.findoidjoins
 
-
-all: $(PROGRAM)
-
-$(PROGRAM): $(OBJS) $(LIBPGEASYDIR)/libpgeasy.a 
-	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPGEASY) 
-
-
-install: install_doc nstall_bin
-
-install_doc:
-	for inst_file in $(DOCS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
-	done
-
-install_bin:
-	for inst_file in $(BINS); do \
-		$(INSTALL) $(INSTL_EXE_OPTS) $$inst_file $(CONTRIB_BINDIR); \
-	done
-
-depend dep:
-	$(CC) -MM -MG $(CFLAGS) *.c > depend
-
-clean:
-	$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
-
-ifeq (depend,$(wildcard depend))
-include depend
-endif
+clean distclean maintainer-clean:
+	rm -f findoidjoins$(X)
diff --git a/contrib/fulltextindex/BENCH b/contrib/fulltextindex/BENCH
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/contrib/fulltextindex/BENCH
+++ /dev/null
diff --git a/contrib/fulltextindex/Makefile b/contrib/fulltextindex/Makefile
index 0ab836c6013..cb76c19405a 100644
--- a/contrib/fulltextindex/Makefile
+++ b/contrib/fulltextindex/Makefile
@@ -1,58 +1,40 @@
 #
-# $Header: /cvsroot/pgsql/contrib/fulltextindex/Attic/Makefile,v 1.6 2000/07/04 16:16:48 momjian Exp $
+# $Header: /cvsroot/pgsql/contrib/fulltextindex/Attic/Makefile,v 1.7 2000/07/09 13:13:07 petere Exp $
 #
 
-TOPDIR=../..
+subdir = contrib/fulltextindex
+top_builddir = ../..
+include ../../src/Makefile.global
 
-include ../Makefile.global
-
-NAME	= fti
-
-PROGRAM	= 
-OBJS	= $(NAME).o
-DOCS	= README.$(NAME)
-SQLS	= $(NAME).sql
-BINS	= fti.pl
-EXAMPLES=
-MODS	= $(NAME)$(DLSUFFIX)
+NAME	:= fti
+SONAME	:= $(NAME)$(DLSUFFIX)
 
 CFLAGS += -I. $(CFLAGS_SL)
 
-OTHER_CLEAN = $(SQLS)
-
-all: $(MODS) $(SQLS)
+all: $(SONAME) $(NAME).sql
 
-%.sql: %.sql.in
-	$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@:.sql=$(DLSUFFIX))|" < $< > $@
+$(NAME).sql: $(NAME).sql.in
+	sed -e 's:MODULE_PATHNAME:$(libdir)/contrib/$(SONAME):g' < $< > $@
 
-install: install_doc install_sql install_mod install_bin
+install: all installdirs
+	$(INSTALL_SCRIPT) fti.pl	$(bindir)
+	$(INSTALL_SHLIB) $(SONAME)	$(libdir)/contrib
+	$(INSTALL_DATA) $(NAME).sql	$(datadir)/contrib
+	$(INSTALL_DATA) README.$(NAME)	$(docdir)/contrib
 
-install_doc:
-	for inst_file in $(DOCS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
-	done
+installdirs:
+	$(mkinstalldirs) $(bindir) $(libdir)/contrib $(datadir)/contrib $(docdir)/contrib
 
-install_sql:
-	for inst_file in $(SQLS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
-	done
+uninstall:
+	rm -f $(bindir)/fti.pl $(libdir)/contrib/$(SONAME) \
+	  $(datadir)/contrib/$(NAME).sql $(docdir)/contrib/README.$(NAME)
 
-install_mod:
-	for inst_file in $(MODS); do \
-		$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
-	done
-
-install_bin:
-	for inst_file in $(BINS); do \
-		$(INSTALL) $(INSTL_EXE_OPTS) $$inst_file $(CONTRIB_BINDIR); \
-	done
+clean distclean maintainer-clean:
+	rm -f $(SONAME) $(NAME).sql
 
 depend dep:
 	$(CC) -MM -MG $(CFLAGS) *.c > depend
 
-clean:
-	$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
-
 ifeq (depend,$(wildcard depend))
 include depend
 endif
diff --git a/contrib/isbn_issn/Makefile b/contrib/isbn_issn/Makefile
index fcf120df877..6969063eeb3 100644
--- a/contrib/isbn_issn/Makefile
+++ b/contrib/isbn_issn/Makefile
@@ -1,54 +1,38 @@
 #
-# $Header: /cvsroot/pgsql/contrib/isbn_issn/Attic/Makefile,v 1.6 2000/07/04 16:16:53 momjian Exp $
+# $Header: /cvsroot/pgsql/contrib/isbn_issn/Attic/Makefile,v 1.7 2000/07/09 13:13:10 petere Exp $
 #
 
-TOPDIR=../..
+subdir = contrib/isbn_issn
+top_builddir = ../..
+include ../../src/Makefile.global
 
-include ../Makefile.global
-
-NAME	= isbn_issn
-
-PROGRAM	= 
-OBJS	= $(NAME).o
-DOCS	= README.$(NAME)
-SQLS	= $(NAME).sql
-BINS	=
-EXAMPLES=
-MODS	= $(NAME)$(DLSUFFIX)
+NAME	:= isbn_issn
+SONAME	:= $(NAME)$(DLSUFFIX)
 
 CFLAGS += -I. $(CFLAGS_SL)
 
-OTHER_CLEAN = $(SQLS)
-
-all: $(MODS) $(SQLS)
+all: $(SONAME) $(NAME).sql
 
+$(NAME).sql: $(NAME).sql.in
+	sed -e 's:MODULE_PATHNAME:$(libdir)/contrib/$(SONAME):g' < $< > $@
 
-%.sql: %.sql.in
-	$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@:.sql=$(DLSUFFIX))|" < $< > $@
+install: all installdirs
+	$(INSTALL_DATA) README.$(NAME)  $(docdir)/contrib
+	$(INSTALL_DATA) $(NAME).sql $(datadir)/contrib
+	$(INSTALL_SHLIB) $(SONAME)  $(libdir)/contrib
 
-install: install_doc install_sql install_mod 
+installdirs:
+	$(mkinstalldirs) $(docdir)/contrib $(datadir)/contrib $(libdir)/contrib
 
-install_doc:
-	for inst_file in $(DOCS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
-	done
+uninstall:
+	rm -rf $(docdir)/contrib/README.$(NAME) $(datadir)/contrib/$(NAME).sql $(libdir)/contrib/$(SONAME)
 
-install_sql:
-	for inst_file in $(SQLS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
-	done
-
-install_mod:
-	for inst_file in $(MODS); do \
-		$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
-	done
+clean distclean maintainer-clean:
+	rm -f $(SONAME) $(NAME).sql
 
 depend dep:
 	$(CC) -MM -MG $(CFLAGS) *.c > depend
 
-clean:
-	$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
-
 ifeq (depend,$(wildcard depend))
 include depend
 endif
diff --git a/contrib/linux/Makefile b/contrib/linux/Makefile
deleted file mode 100644
index 3e11fd11cd8..00000000000
--- a/contrib/linux/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# $Header: /cvsroot/pgsql/contrib/linux/Attic/Makefile,v 1.2 2000/06/19 13:53:41 momjian Exp $
-#
-
-TOPDIR=../..
-
-include ../Makefile.global
-
-NAME	= 
-
-PROGRAM	= 
-OBJS	= 
-DOCS	= 
-SQLS	= 
-BINS	=
-BINS    = postgres.init.csh postgres.init.sh
-
-EXAMPLES=
-MODS	= 
-
-OTHER_CLEAN = 
-
-all: 
-
-install: install_bin
-
-install_bin:
-	for inst_file in $(BINS); do \
-		$(INSTALL) $(INSTL_EXE_OPTS) $$inst_file $(CONTRIB_BINDIR); \
-	done
-
-depend dep:
-	$(CC) -MM -MG $(CFLAGS) *.c > depend
-
-clean:
-	$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
-
-ifeq (depend,$(wildcard depend))
-include depend
-endif
diff --git a/contrib/lo/Makefile b/contrib/lo/Makefile
index 4685bcd131d..ed192a9d280 100644
--- a/contrib/lo/Makefile
+++ b/contrib/lo/Makefile
@@ -1,19 +1,15 @@
 #
-# $Header: /cvsroot/pgsql/contrib/lo/Makefile,v 1.6 2000/07/04 16:16:54 momjian Exp $
+# $Header: /cvsroot/pgsql/contrib/lo/Makefile,v 1.7 2000/07/09 13:13:14 petere Exp $
 #
 
-TOPDIR=../..
+subdir = contrib/lo
+top_builddir = ../..
+include ../../src/Makefile.global
 
-include ../Makefile.global
+NAME	:= lo
+SONAME	:= $(NAME)$(DLSUFFIX)
 
-NAME	= lo
-
-PROGRAM	= 
-OBJS	= $(NAME).o
-DOCS	= README.$(NAME)
 SQLS	= $(NAME).sql lo_drop.sql lo_test.sql
-BINS	=
-EXAMPLES=
 MODS	= $(NAME)$(DLSUFFIX)
 
 CFLAGS += -I. $(CFLAGS_SL)
@@ -22,39 +18,31 @@ ifdef REFINT_VERBOSE
 CFLAGS+= -DREFINT_VERBOSE
 endif
 
-OTHER_CLEAN = $(SQLS)
-
-all: $(MODS) $(SQLS)
-
+all: $(SONAME) $(NAME).sql
 
-%.sql: %.sql.in
-	$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@:.sql=$(DLSUFFIX))|" < $< > $@
+$(NAME).sql: $(NAME).sql.in
+	sed -e 's:MODULE_PATHNAME:$(libdir)/contrib/$(SONAME):g' < $< > $@
 
+install: all installdirs
+	$(INSTALL_SHLIB) $(SONAME)	$(libdir)/contrib
+	$(INSTALL_DATA) README.$(NAME)	$(docdir)/contrib
+	$(INSTALL_DATA) $(NAME).sql	$(datadir)/contrib
+	$(INSTALL_DATA) lo_drop.sql	$(datadir)/contrib
+	$(INSTALL_DATA) lo_test.sql	$(datadir)/contrib
 
-install: install_doc install_sql install_mod
+installdirs:
+	$(mkinstalldirs) $(libdir)/contrib $(docdir)/contrib $(datadir)/contrib
 
-install_doc:
-	for inst_file in $(DOCS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
-	done
+uninstall:
+	rm -f $(libdir)/contrib/$(SONAME) $(docdir)/contrib/README.$(NAME) \
+	  $(addprefix $(datadir)/contrib/, $(NAME).sql lo_drop.sql lo_test.sql)
 
-install_sql:
-	for inst_file in $(SQLS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
-	done
-
-install_mod:
-	for inst_file in $(MODS); do \
-		$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
-	done
+clean distclean maintainer-clean:
+	rm -f $(SONAME) $(NAME).sql
 
 depend dep:
 	$(CC) -MM -MG $(CFLAGS) *.c > depend
 
-clean:
-	$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
-
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-
diff --git a/contrib/mSQL-interface/Makefile b/contrib/mSQL-interface/Makefile
index 7950b6934db..cbebcef9293 100644
--- a/contrib/mSQL-interface/Makefile
+++ b/contrib/mSQL-interface/Makefile
@@ -1,35 +1,30 @@
 #
-# $Header: /cvsroot/pgsql/contrib/mSQL-interface/Attic/Makefile,v 1.3 2000/06/19 13:53:47 momjian Exp $
+# $Header: /cvsroot/pgsql/contrib/mSQL-interface/Attic/Makefile,v 1.4 2000/07/09 13:13:17 petere Exp $
 #
 
-TOPDIR=../..
+subdir = contrib/mSQL-interface
+top_builddir = ../..
+include ../../src/Makefile.global
 
-include ../Makefile.global
+NAME	:= mpgsql
+SO_MAJOR_VERSION := 0
+SO_MINOR_VERSION := 0
+OBJS	:= mpgsql.o
 
-NAME	= mpgsql
+CFLAGS	+= -I$(LIBPQDIR)
 
-PROGRAM	= 
-OBJS	= 
-DOCS	= README.$(NAME) $(NAME).c
-SQLS	= 
-BINS    = 
-EXAMPLES=
-MODS	= 
+include $(top_srcdir)/src/Makefile.shlib
 
-OTHER_CLEAN = 
+all: all-lib
 
-all::
+install: all installdirs install-lib
+	$(INSTALL_DATA) README.$(NAME) $(docdir)/contrib
 
-install: install_doc
+installdirs:
+	$(mkinstalldirs) $(libdir) $(docdir)/contrib
 
-install_doc:
-	for inst_file in $(DOCS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
-	done
+uninstall: uninstall-lib
+	rm -f $(docdir)/contrib/README.$(NAME)
 
-clean:
-	$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
-
-ifeq (depend,$(wildcard depend))
-include depend
-endif
+clean distclean maintainer-clean: clean-lib
+	rm -f $(OBJS)
diff --git a/contrib/miscutil/Makefile b/contrib/miscutil/Makefile
index 1faf78b0716..6ed5712bf4d 100644
--- a/contrib/miscutil/Makefile
+++ b/contrib/miscutil/Makefile
@@ -1,53 +1,38 @@
 #
-# $Header: /cvsroot/pgsql/contrib/miscutil/Attic/Makefile,v 1.11 2000/07/04 16:16:59 momjian Exp $
+# $Header: /cvsroot/pgsql/contrib/miscutil/Attic/Makefile,v 1.12 2000/07/09 13:13:20 petere Exp $
 #
 
-TOPDIR=../..
+subdir = contrib/miscutil
+top_builddir = ../..
+include ../../src/Makefile.global
 
-include ../Makefile.global
-
-NAME	= misc_utils
-
-PROGRAM	= 
-OBJS	= $(NAME).o
-DOCS	= README.$(NAME)
-SQLS	= $(NAME).sql
-BINS	=
-EXAMPLES=
-MODS	= $(NAME)$(DLSUFFIX)
+NAME	:= misc_utils
+SONAME	:= $(NAME)$(DLSUFFIX)
 
 CFLAGS += -I. $(CFLAGS_SL)
 
-OTHER_CLEAN = $(SQLS)
+all: $(SONAME) $(NAME).sql
 
-all: $(MODS) $(SQLS)
+$(NAME).sql: $(NAME).sql.in
+	sed -e 's:MODULE_PATHNAME:$(libdir)/contrib/$(SONAME):g' < $< > $@
 
-%.sql: %.sql.in
-	$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@:.sql=$(DLSUFFIX))|" < $< > $@
+install: all installdirs
+	$(INSTALL_SHLIB) $(SONAME)	$(libdir)/contrib
+	$(INSTALL_DATA) $(NAME).sql	$(datadir)/contrib
+	$(INSTALL_DATA) README.$(NAME)	$(docdir)/contrib
 
-install: install_doc install_sql install_mod
+installdirs:
+	$(mkinstalldirs) $(libdir)/contrib $(datadir)/contrib $(docdir)/contrib
 
-install_doc:
-	for inst_file in $(DOCS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
-	done
+uninstall:
+	rm -f $(libdir)/contrib/$(SONAME) $(datadir)/contrib/$(NAME).sql $(docdir)/contrib/README.$(NAME)
 
-install_sql:
-	for inst_file in $(SQLS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
-	done
-
-install_mod:
-	for inst_file in $(MODS); do \
-		$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
-	done
+clean distclean maintainer-clean:
+	rm -f $(SONAME) $(NAME).sql
 
 depend dep:
 	$(CC) -MM -MG $(CFLAGS) *.c > depend
 
-clean:
-	$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
-
 ifeq (depend,$(wildcard depend))
 include depend
 endif
diff --git a/contrib/noupdate/Makefile b/contrib/noupdate/Makefile
index ea8b48f2d21..65a6e06737b 100644
--- a/contrib/noupdate/Makefile
+++ b/contrib/noupdate/Makefile
@@ -1,53 +1,38 @@
 #
-# $Header: /cvsroot/pgsql/contrib/noupdate/Attic/Makefile,v 1.4 2000/07/04 16:17:03 momjian Exp $
+# $Header: /cvsroot/pgsql/contrib/noupdate/Attic/Makefile,v 1.5 2000/07/09 13:13:24 petere Exp $
 #
 
-TOPDIR=../..
+subdir = contrib/noupdate
+top_builddir = ../..
+include ../../src/Makefile.global
 
-include ../Makefile.global
-
-NAME	= noup
-
-PROGRAM	= 
-OBJS	= $(NAME).o
-DOCS	= README.$(NAME)
-SQLS	= $(NAME).sql
-BINS	=
-EXAMPLES=
-MODS	= $(NAME)$(DLSUFFIX)
+NAME	:= noup
+SONAME	:= $(NAME)$(DLSUFFIX)
 
 CFLAGS += -I. $(CFLAGS_SL)
 
-OTHER_CLEAN = $(SQLS)
+all: $(SONAME) $(NAME).sql
 
-all: $(MODS) $(SQLS)
+$(NAME).sql: $(NAME).sql.in
+	sed -e 's:MODULE_PATHNAME:$(libdir)/contrib/$(SONAME):g' < $< > $@
 
-%.sql: %.sql.in
-	$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@:.sql=$(DLSUFFIX))|" < $< > $@
+install: all installdirs
+	$(INSTALL_SHLIB) $(SONAME)	$(libdir)/contrib
+	$(INSTALL_DATA) $(NAME).sql	$(datadir)/contrib
+	$(INSTALL_DATA) README.$(NAME)	$(docdir)/contrib
 
-install: install_doc install_sql install_mod
+installdirs:
+	$(mkinstalldirs) $(libdir)/contrib $(datadir)/contrib $(docdir)/contrib
 
-install_doc:
-	for inst_file in $(DOCS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
-	done
+uninstall:
+	rm -f $(libdir)/contrib/$(SONAME) $(datadir)/contrib/$(NAME).sql $(docdir)/contrib/README.$(NAME)
 
-install_sql:
-	for inst_file in $(SQLS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
-	done
-
-install_mod:
-	for inst_file in $(MODS); do \
-		$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
-	done
+clean distclean maintainer-clean:
+	rm -f $(SONAME) $(NAME).sql
 
 depend dep:
 	$(CC) -MM -MG $(CFLAGS) *.c > depend
 
-clean:
-	$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
-
 ifeq (depend,$(wildcard depend))
 include depend
 endif
diff --git a/contrib/pg_dumplo/Makefile b/contrib/pg_dumplo/Makefile
index d981e380071..569339cbb6d 100644
--- a/contrib/pg_dumplo/Makefile
+++ b/contrib/pg_dumplo/Makefile
@@ -1,50 +1,35 @@
 #
-# $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/Makefile,v 1.4 2000/06/19 13:54:01 momjian Exp $
+# $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/Makefile,v 1.5 2000/07/09 13:13:24 petere Exp $
 #
 
-TOPDIR=../..
+subdir = contrib/pg_dumplo
+top_builddir = ../..
+include ../../src/Makefile.global
 
-include ../Makefile.global
-
-NAME	= pg_dumplo
-
-PROGRAM	= $(NAME)
 OBJS	= main.o lo_export.o lo_import.o utils.o
-DOCS	= README.$(NAME)
-SQLS	= 
-BINS	= $(PROGRAM)
-EXAMPLES=
-MODS	= 
-
 CFLAGS += -I$(LIBPQDIR)
 
-OTHER_CLEAN = 
-
-all: $(PROGRAM)
+all: pg_dumplo
 
-$(PROGRAM): $(OBJS) $(LIBPQDIR)/libpq.a
+pg_dumplo: $(OBJS) $(LIBPQDIR)/libpq.a
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPQ) 
 
-install: install_doc install_bin
+install: all installdirs
+	$(INSTALL_PROGRAM) pg_dumplo$(X)	$(bindir)
+	$(INSTALL_DATA) README.pg_dumplo	$(docdir)/contrib
 
-install_doc:
-	for inst_file in $(DOCS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
-	done
+installdirs:
+	$(mkinstalldirs) $(bindir) $(docdir)/contrib
 
-install_bin:
-	for inst_file in $(BINS); do \
-		$(INSTALL) $(INSTL_EXE_OPTS) $$inst_file $(CONTRIB_BINDIR); \
-	done
+uninstall:
+	rm -f $(bindir)/pg_dumplo$(X) $(docdir)/contrib/README.pg_dumplo
+
+clean distclean maintainer-clean:
+	rm -f pg_dumplo $(OBJS)
 
 depend dep:
 	$(CC) -MM -MG $(CFLAGS) *.c > depend
 
-clean:
-	$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
-
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-
- 
-\ No newline at end of file
diff --git a/contrib/pgbench/Makefile b/contrib/pgbench/Makefile
index c9f7c3f2b22..8db147cce7d 100644
--- a/contrib/pgbench/Makefile
+++ b/contrib/pgbench/Makefile
@@ -1,48 +1,26 @@
 #
-# $Header: /cvsroot/pgsql/contrib/pgbench/Makefile,v 1.4 2000/06/19 13:54:09 momjian Exp $
+# $Header: /cvsroot/pgsql/contrib/pgbench/Makefile,v 1.5 2000/07/09 13:13:29 petere Exp $
 #
 
-TOPDIR=../..
+subdir = contrib/pgbench
+top_builddir = ../..
+include ../../src/Makefile.global
 
-include ../Makefile.global
+CFLAGS	+= -I$(LIBPQDIR)
+LIBS	+= $(LIBPQ)
 
-NAME	= pgbench
+all: pgbench
 
-PROGRAM	= $(NAME)
-OBJS	= $(NAME).o
-DOCS	= README.$(NAME) README.$(NAME)_jis
-SQLS	= 
-BINS    = $(PROGRAM) 
-EXAMPLES=
-MODS	= 
+install: all installdirs
+	$(INSTALL_PROGRAM) pgbench$(X)	$(bindir)
+	$(INSTALL_DATA) README.pgbench	$(docdir)/contrib
+	$(INSTALL_DATA) README.pgbench_jis $(docdir)/contrib
 
-CFLAGS += -I$(LIBPQDIR)
+installdirs:
+	$(mkinstalldirs) $(bindir) $(docdir)/contrib
 
-OTHER_CLEAN = 
+uninstall:
+	rm -f $(bindir)/pgbench$(X) $(docdir)/contrib/README.pgbench $(docdir)/contrib/README.pgbench_jis
 
-all: $(PROGRAM)
-
-$(PROGRAM): $(OBJS) $(LIBPQDIR)/libpq.a
-	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPQ)
-
-install: install_doc install_bin
-
-install_doc:
-	for inst_file in $(DOCS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
-	done
-
-install_bin:
-	for inst_file in $(BINS); do \
-		$(INSTALL) $(INSTL_EXE_OPTS) $$inst_file $(CONTRIB_BINDIR); \
-	done
-
-depend dep:
-	$(CC) -MM -MG $(CFLAGS) *.c > depend
-
-clean:
-	$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
-
-ifeq (depend,$(wildcard depend))
-include depend
-endif
+clean distclean maintainer-clean:
+	rm -f pgbench$(X)
diff --git a/contrib/soundex/Makefile b/contrib/soundex/Makefile
index ffd64f49926..616b96c47ee 100644
--- a/contrib/soundex/Makefile
+++ b/contrib/soundex/Makefile
@@ -1,54 +1,38 @@
 #
-# $Header: /cvsroot/pgsql/contrib/soundex/Attic/Makefile,v 1.6 2000/07/04 16:17:08 momjian Exp $
+# $Header: /cvsroot/pgsql/contrib/soundex/Attic/Makefile,v 1.7 2000/07/09 13:13:33 petere Exp $
 #
 
-TOPDIR=../..
+subdir = contrib/soundex
+top_builddir = ../..
+include ../../src/Makefile.global
 
-include ../Makefile.global
-
-NAME	= soundex
-
-PROGRAM	= 
-OBJS	= $(NAME).o
-DOCS	= README.$(NAME)
-SQLS	= $(NAME).sql
-BINS	=
-EXAMPLES=
-MODS	= $(NAME)$(DLSUFFIX)
+NAME	:= soundex
+SONAME	:= $(NAME)$(DLSUFFIX)
 
 CFLAGS += -I. $(CFLAGS_SL)
 
-OTHER_CLEAN = $(SQLS)
-
-all: $(MODS) $(SQLS)
+all: $(SONAME) $(NAME).sql
 
+$(NAME).sql: $(NAME).sql.in
+	sed -e 's:MODULE_PATHNAME:$(datadir)/contrib/$(SONAME):g' < $< > $@
 
-%.sql: %.sql.in
-	$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@:.sql=$(DLSUFFIX))|" < $< > $@
+install: all installdirs
+	$(INSTALL_SHLIB) $(SONAME)	$(libdir)/contrib
+	$(INSTALL_DATA) $(NAME).sql	$(datadir)/contrib
+	$(INSTALL_DATA) README.$(NAME)	$(docdir)/contrib
 
-install: install_doc install_sql install_mod 
+installdirs:
+	$(mkinstalldirs) $(libdir)/contrib $(datadir)/contrib $(docdir)/contrib
 
-install_doc:
-	for inst_file in $(DOCS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
-	done
+uninstall:
+	rm -f $(libdir)/contrib/$(SONAME) $(datadir)/contrib/$(NAME).sql $(docdir)/contrib/README.$(NAME)
 
-install_sql:
-	for inst_file in $(SQLS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
-	done
-
-install_mod:
-	for inst_file in $(MODS); do \
-		$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
-	done
+clean distclean maintainer-clean:
+	rm -f $(SONAME) $(NAME).sql
 
 depend dep:
 	$(CC) -MM -MG $(CFLAGS) *.c > depend
 
-clean:
-	$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
-
 ifeq (depend,$(wildcard depend))
 include depend
 endif
diff --git a/contrib/spi/Makefile b/contrib/spi/Makefile
index 9a6ca052975..60bc2e6dbf3 100644
--- a/contrib/spi/Makefile
+++ b/contrib/spi/Makefile
@@ -1,19 +1,15 @@
 #
-# $Header: /cvsroot/pgsql/contrib/spi/Makefile,v 1.16 2000/07/04 16:17:11 momjian Exp $
+# $Header: /cvsroot/pgsql/contrib/spi/Makefile,v 1.17 2000/07/09 13:13:36 petere Exp $
 #
 
-TOPDIR=../..
+subdir = contrib/spi
+top_builddir = ../..
+include ../../src/Makefile.global
 
-include ../Makefile.global
-
-NAME	= 
-
-PROGRAM	= 
 OBJS	= autoinc.o insert_username.o moddatetime.o refint.o timetravel.o
 DOCS	= README.spi
 SQLS	= $(OBJS:.o=.sql)
-BINS	=
-EXAMPLES= $(OBJS:.o=.example) new_example.example
+EXAMPLES= $(OBJS:.o=.example)
 MODS	= $(OBJS:.o=$(DLSUFFIX))
 
 CFLAGS += -I. $(CFLAGS_SL)
@@ -22,43 +18,36 @@ ifdef REFINT_VERBOSE
 CFLAGS+= -DREFINT_VERBOSE
 endif
 
-OTHER_CLEAN = $(SQLS)
-
 all: $(MODS) $(SQLS)
 
 %.sql: %.sql.in
-	$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@:.sql=$(DLSUFFIX))|" < $< > $@
-
-install: install_doc install_sql install_mod install_example
+	sed -e 's:MODULE_PATHNAME:$(libdir)/contrib/$(@:.sql=$(DLSUFFIX)):g' < $< > $@
 
-install_doc:
-	for inst_file in $(DOCS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
-	done
-
-install_sql:
+install: all installdirs
 	for inst_file in $(SQLS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
+	    $(INSTALL_DATA) $$inst_file $(datadir)/contrib || exit; \
 	done
-
-install_mod:
 	for inst_file in $(MODS); do \
-		$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
+	    $(INSTALL_SHLIB) $$inst_file $(libdir)/contrib || exit; \
 	done
-
-install_example:
-	for inst_file in $(EXAMPLES); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_EXAMPLESDIR); \
+	for inst_file in $(EXAMPLES) README.spi; do \
+	    $(INSTALL_DATA) $$inst_file $(docdir)/contrib/spi || exit; \
 	done
 
+installdirs:
+	$(mkinstalldirs) $(datadir)/contrib $(libdir)/contrib $(docdir)/contrib/spi
+
+uninstall:
+	rm -f $(addprefix $(datadir)/contrib/, $(SQLS)) \
+	  $(addprefix $(libdir)/contrib/, $(MODS)) \
+	  $(addprefix $(docdir)/contrib/spi/, $(EXAMPLES) README.spi)
+
+clean distclean maintainer-clean:
+	rm -f $(MODS) $(SQLS) $(OBJS)
+
 depend dep:
 	$(CC) -MM -MG $(CFLAGS) *.c > depend
 
-clean:
-	$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
-
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-
-
diff --git a/contrib/spi/new_example.sql b/contrib/spi/new_example.sql
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/contrib/spi/new_example.sql
+++ /dev/null
diff --git a/contrib/statmath/Makefile b/contrib/statmath/Makefile
index cafd36e2b43..e292c52e6ca 100644
--- a/contrib/statmath/Makefile
+++ b/contrib/statmath/Makefile
@@ -1,58 +1,38 @@
 #
-# $Header: /cvsroot/pgsql/contrib/statmath/Attic/Makefile,v 1.1 2000/07/04 14:36:03 wieck Exp $
+# $Header: /cvsroot/pgsql/contrib/statmath/Attic/Makefile,v 1.2 2000/07/09 13:13:41 petere Exp $
 #
 
-TOPDIR=../..
+subdir = contrib/statmath
+top_builddir = ../..
+include ../../src/Makefile.global
 
-include ../Makefile.global
-
-NAME	= statmath
-
-PROGRAM	= 
-OBJS	= $(NAME).o
-DOCS	= README.$(NAME)
-SQLS	= $(NAME).sql
-BINS	=
-EXAMPLES=
-MODS	= $(NAME)$(DLSUFFIX)
+NAME	:= statmath
+SONAME	:= $(NAME)$(DLSUFFIX)
 
 CFLAGS += -I. $(CFLAGS_SL)
 
-OTHER_CLEAN = $(SQLS)
-
-all: $(MODS) $(SQLS)
-
-%.sql: %.sql.in
-	$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(NAME)$(DLSUFFIX)|" < $< > $@
+all: $(SONAME) $(NAME).sql
 
-install: install_doc install_sql install_mod install_bin
+$(NAME).sql: $(NAME).sql.in
+	sed -e 's:MODULE_PATHNAME:$(libdir)/contrib/$(SONAME):g' < $< > $@
 
-install_doc:
-	for inst_file in $(DOCS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
-	done
+install: all installdirs
+	$(INSTALL_SHLIB) $(SONAME)	$(libdir)/contrib
+	$(INSTALL_DATA) $(NAME).sql	$(datadir)/contrib
+	$(INSTALL_DATA) README.$(NAME)	$(docdir)/contrib
 
-install_sql:
-	for inst_file in $(SQLS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
-	done
+installdirs:
+	$(mkinstalldirs) $(libdir)/contrib $(datadir)/contrib $(docdir)/contrib
 
-install_mod:
-	for inst_file in $(MODS); do \
-		$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
-	done
+uninstall:
+	rm -f $(libdir)/contrib/$(SONAME) $(datadir)/contrib/$(NAME).sql $(docdir)/contrib/README.$(NAME)
 
-install_bin:
-	for inst_file in $(BINS); do \
-		$(INSTALL) $(INSTL_EXE_OPTS) $$inst_file $(CONTRIB_BINDIR); \
-	done
+clean:
+	rm -f $(SONAME) $(NAME).sql
 
 depend dep:
 	$(CC) -MM -MG $(CFLAGS) *.c > depend
 
-clean:
-	$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
-
 ifeq (depend,$(wildcard depend))
 include depend
 endif
diff --git a/contrib/string/Makefile b/contrib/string/Makefile
index ad80116e032..1b01e63afbf 100644
--- a/contrib/string/Makefile
+++ b/contrib/string/Makefile
@@ -1,54 +1,38 @@
  #
-# $Header: /cvsroot/pgsql/contrib/string/Attic/Makefile,v 1.11 2000/07/04 16:17:17 momjian Exp $
+# $Header: /cvsroot/pgsql/contrib/string/Attic/Makefile,v 1.12 2000/07/09 13:13:43 petere Exp $
 #
 
-TOPDIR=../..
+subdir = contrib/string
+top_builddir = ../..
+include ../../src/Makefile.global
 
-include ../Makefile.global
-
-NAME	= string_io
-
-PROGRAM	= 
-OBJS	= $(NAME).o
-DOCS	= README.$(NAME)
-SQLS	= $(NAME).sql
-BINS	=
-EXAMPLES=
-MODS	= $(NAME)$(DLSUFFIX)
+NAME	:= string_io
+SONAME	:= $(NAME)$(DLSUFFIX)
 
 CFLAGS += -I. $(CFLAGS_SL)
 
-OTHER_CLEAN = $(SQLS)
-
-all: $(MODS) $(SQLS)
-
+all: $(SONAME) $(NAME).sql
 
 %.sql: %.sql.in
-	$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@:.sql=$(DLSUFFIX))|" < $< > $@
+	sed -e 's:MODULE_PATHNAME:$(libdir)/contrib/$(@:.sql=$(DLSUFFIX)):g' < $< > $@
 
-install: install_doc install_sql install_mod
+install: all installdirs
+	$(INSTALL_SHLIB) $(SONAME)	$(libdir)/contrib
+	$(INSTALL_DATA) $(NAME).sql	$(datadir)/contrib
+	$(INSTALL_DATA) README.$(NAME)	$(docdir)/contrib
 
-install_doc:
-	for inst_file in $(DOCS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
-	done
+installdirs:
+	$(mkinstalldirs) $(libdir)/contrib $(datadir)/contrib $(docdir)/contrib
 
-install_sql:
-	for inst_file in $(SQLS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
-	done
+uninstall:
+	rm -f $(libdir)/contrib/$(SONAME) $(datadir)/contrib/$(NAME).sql $(docdir)/contrib/README.$(NAME)
 
-install_mod:
-	for inst_file in $(MODS); do \
-		$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
-	done
+clean distclean maintainer-clean:
+	rm -f $(SONAME) $(NAME).sql
 
 depend dep:
 	$(CC) -MM -MG $(CFLAGS) *.c > depend
 
-clean:
-	$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
-
 ifeq (depend,$(wildcard depend))
 include depend
 endif
diff --git a/contrib/tips/Makefile b/contrib/tips/Makefile
index 54d5e19f280..d14514b482e 100644
--- a/contrib/tips/Makefile
+++ b/contrib/tips/Makefile
@@ -1,31 +1,18 @@
 #
-# $Header: /cvsroot/pgsql/contrib/tips/Attic/Makefile,v 1.3 2000/06/19 13:54:31 momjian Exp $
+# $Header: /cvsroot/pgsql/contrib/tips/Attic/Makefile,v 1.4 2000/07/09 13:13:43 petere Exp $
 #
 
-TOPDIR=../..
+subdir = contrib/tips
+top_builddir = ../..
+include ../../src/Makefile.global
 
-include ../Makefile.global
+all:
 
-NAME	= 
+install: installdirs
+	$(INSTALL_DATA) README.apachelog $(docdir)/contrib
 
-PROGRAM	= 
-OBJS	= 
-DOCS	= README.apachelog
-SQLS	= 
-BINS	=
-EXAMPLES=
-MODS	= 
-
-all::
-
-install: install_doc 
-
-install_doc:
-	$(TOPDIR)/config/mkinstalldirs $(CONTRIB_DOCDIR)/tips
-	for inst_file in $(DOCS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR)/tips; \
-	done
-
-clean:
-	$(RM) *~ 
+installdirs:
+	$(mkinstalldirs) $(docdir)/contrib
 
+uninstall:
+	rm -f $(docdir)/contrib/README.apachelog
diff --git a/contrib/tools/Makefile b/contrib/tools/Makefile
deleted file mode 100644
index ecf8ac3167b..00000000000
--- a/contrib/tools/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# $Header: /cvsroot/pgsql/contrib/tools/Attic/Makefile,v 1.3 2000/06/19 13:54:37 momjian Exp $
-#
-
-TOPDIR=../..
-
-include ../Makefile.global
-
-NAME	= 
-
-PROGRAM	= 
-OBJS	= 
-DOCS	= 
-SQLS	= 
-BINS	=
-EXAMPLES=
-MODS	= 
-
-clean:
-	$(RM) *~ 
-
diff --git a/contrib/unixdate/Makefile b/contrib/unixdate/Makefile
index 137f15493ce..828ed9579cc 100644
--- a/contrib/unixdate/Makefile
+++ b/contrib/unixdate/Makefile
@@ -1,30 +1,18 @@
 #
-# $Header: /cvsroot/pgsql/contrib/unixdate/Attic/Makefile,v 1.2 2000/06/19 13:54:38 momjian Exp $
+# $Header: /cvsroot/pgsql/contrib/unixdate/Attic/Makefile,v 1.3 2000/07/09 13:13:50 petere Exp $
 #
 
-TOPDIR=../..
+subdir = contrib/unixdate
+top_builddir = ../..
+include ../../src/Makefile.global
 
-include ../Makefile.global
+all:
 
-NAME	= unixdate
+install: installdirs
+	$(INSTALL_DATA) unixdate.sql $(datadir)/contrib
 
-PROGRAM	= 
-OBJS	= 
-DOCS	= 
-SQLS	= $(NAME).sql
-BINS	=
-EXAMPLES=
-MODS	= 
-
-all:: 
-
-install: install_sql
-
-install_sql:
-	for inst_file in $(SQLS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
-	done
-
-clean:
-	$(RM) *~ 
+uninstall:
+	rm -f $(datadir)/contrib/unixdate.sql
 
+installdirs:
+	$(mkinstalldirs) $(datadir)/contrib
diff --git a/contrib/userlock/Makefile b/contrib/userlock/Makefile
index d68315a70d9..7c262087c9e 100644
--- a/contrib/userlock/Makefile
+++ b/contrib/userlock/Makefile
@@ -1,53 +1,38 @@
 #
-# $Header: /cvsroot/pgsql/contrib/userlock/Attic/Makefile,v 1.11 2000/07/04 16:17:21 momjian Exp $
+# $Header: /cvsroot/pgsql/contrib/userlock/Attic/Makefile,v 1.12 2000/07/09 13:13:52 petere Exp $
 #
 
-TOPDIR=../..
+subdir = contrib/userlock
+top_builddir = ../..
+include ../../src/Makefile.global
 
-include ../Makefile.global
-
-NAME	= user_locks
-
-PROGRAM	= 
-OBJS	= $(NAME).o
-DOCS	= README.$(NAME)
-SQLS	= $(NAME).sql
-BINS	=
-EXAMPLES=
-MODS	= $(NAME)$(DLSUFFIX)
+NAME	:= user_locks
+SONAME	:= $(NAME)$(DLSUFFIX)
 
 CFLAGS += -I. $(CFLAGS_SL)
 
-OTHER_CLEAN = $(SQLS)
-
-all: $(MODS) $(SQLS)
+all: $(SONAME) $(NAME).sql
 
 %.sql: %.sql.in
-	$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@:.sql=$(DLSUFFIX))|" < $< > $@
+	sed -e 's:MODULE_PATHNAME:$(libdir)/contrib/$(@:.sql=$(DLSUFFIX)):g' < $< > $@
 
-install: install_doc install_sql install_mod
+install: all installdirs
+	$(INSTALL_SHLIB) $(SONAME)	$(libdir)/contrib
+	$(INSTALL_DATA) $(NAME).sql	$(datadir)/contrib
+	$(INSTALL_DATA) README.$(NAME)	$(docdir)/contrib
 
-install_doc:
-	for inst_file in $(DOCS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
-	done
+installdirs:
+	$(mkinstalldirs) $(libdir)/contrib $(datadir)/contrib $(docdir)/contrib
 
-install_sql:
-	for inst_file in $(SQLS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
-	done
+uninstall:
+	rm -rf $(libdir)/contrib/$(SONAME) $(datadir)/contrib/$(NAME).sql $(docdir)/contrib/README.$(NAME)
 
-install_mod:
-	for inst_file in $(MODS); do \
-		$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
-	done
+clean distclean maintainer-clean:
+	rm -f $(SONAME) $(NAME).sql
 
 depend dep:
 	$(CC) -MM -MG $(CFLAGS) *.c > depend
 
-clean:
-	$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
-
 ifeq (depend,$(wildcard depend))
 include depend
 endif
diff --git a/contrib/vacuumlo/Makefile b/contrib/vacuumlo/Makefile
index 2c56e542fcd..fefa2ef41e0 100644
--- a/contrib/vacuumlo/Makefile
+++ b/contrib/vacuumlo/Makefile
@@ -1,48 +1,32 @@
 #
-# $Header: /cvsroot/pgsql/contrib/vacuumlo/Makefile,v 1.5 2000/06/19 13:54:50 momjian Exp $
+# $Header: /cvsroot/pgsql/contrib/vacuumlo/Makefile,v 1.6 2000/07/09 13:13:55 petere Exp $
 #
 
-TOPDIR=../..
+subdir = contrib/vacuumlo
+top_builddir = ../..
+include ../../src/Makefile.global
 
-include ../Makefile.global
+CPPFLAGS += -I$(LIBPQDIR)
+LIBS += $(LIBPQ)
 
-NAME	= vacuumlo
+all: vacuumlo
 
-PROGRAM	= $(NAME)
-OBJS	= $(NAME).o
-DOCS	= README.$(NAME)
-SQLS	= 
-BINS    = $(PROGRAM)
-EXAMPLES=
-MODS	= 
+install: all installdirs
+	$(INSTALL_PROGRAM) vacuumlo$(X) $(bindir)
+	$(INSTALL_DATA) README.vacuumlo $(docdir)/contrib
 
-CFLAGS += -I$(LIBPQDIR)
+installdirs:
+	$(mkinstalldirs) $(bindir) $(docdir)/contrib
 
-OTHER_CLEAN = 
+uninstall:
+	rm -f $(bindir)/vacuumlo$(X) $(docdir)/contrib/README.vacuumlo
 
-all: $(PROGRAM)
-
-$(PROGRAM): $(OBJS) $(LIBPGEASYDIR)/libpgeasy.a 
-	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPGEASY) 
-
-install: install_doc install_bin 
-
-install_doc:
-	for inst_file in $(DOCS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
-	done
-
-install_bin:
-	for inst_file in $(BINS); do \
-		$(INSTALL) $(INSTL_EXE_OPTS) $$inst_file $(CONTRIB_BINDIR); \
-	done
+clean distclean maintainer-clean:
+	rm -f vacuumlo$(X)
 
 depend dep:
 	$(CC) -MM -MG $(CFLAGS) *.c > depend
 
-clean:
-	$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
-
 ifeq (depend,$(wildcard depend))
 include depend
 endif