Another round of those unportable config/build changes :-/

* Add option to build with OpenSSL out of the box. Fix thusly exposed bit rot. Although it compiles now, getting this to do something useful is left as an exercise. * Fix Kerberos options to defer checking for required libraries until all the other libraries are checked for. * Change default odbcinst.ini and krb5.srvtab path to PREFIX/etc. * Install work around for Autoconf's install-sh relative path anomaly. Get rid of old INSTL_*_OPTS variables, now that we don't need them anymore. * Use `gunzip -c' instead of g?zcat. Reportedly broke on AIX. * Look for only one of readline.h or readline/readline.h, not both. * Make check for PS_STRINGS cacheable. Don't test for the header files separately. * Disable fcntl(F_SETLK) test on Linux. * Substitute the standard GCC warnings set into CFLAGS in configure, don't add it on in Makefile.global. * Sweep through contrib tree to teach makefiles standard semantics. ... and in completely unrelated news: * Make postmaster.opts arbitrary options-aware. I still think we need to save the environment as well.

Another round of those unportable config/build changes :-/
* Add option to build with OpenSSL out of the box. Fix thusly exposed bit rot. Although it compiles now, getting this to do something useful is left as an exercise. * Fix Kerberos options to defer checking for required libraries until all the other libraries are checked for. * Change default odbcinst.ini and krb5.srvtab path to PREFIX/etc. * Install work around for Autoconf's install-sh relative path anomaly. Get rid of old INSTL_*_OPTS variables, now that we don't need them anymore. * Use `gunzip -c' instead of g?zcat. Reportedly broke on AIX. * Look for only one of readline.h or readline/readline.h, not both. * Make check for PS_STRINGS cacheable. Don't test for the header files separately. * Disable fcntl(F_SETLK) test on Linux. * Substitute the standard GCC warnings set into CFLAGS in configure, don't add it on in Makefile.global. * Sweep through contrib tree to teach makefiles standard semantics. ... and in completely unrelated news: * Make postmaster.opts arbitrary options-aware. I still think we need to save the environment as well.
74618e2b · Peter Eisentraut · b59c03f8 · 74618e2b · 74618e2b · 74618e2b
Commit 74618e2b authored Jul 09, 2000 by Peter Eisentraut
37 changed files
--- a/configure
+++ b/configure
--- a/configure.in
+++ b/configure.in
--- a/contrib/Makefile
+++ b/contrib/Makefile
 #
 # 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
--- a/contrib/Makefile.global
+++ b/contrib/Makefile.global
-
-#-------------------------------------------------------------------------
-#
-# 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
-
-
--- a/contrib/array/Makefile
+++ b/contrib/array/Makefile
 #
-# $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
--- a/contrib/earthdistance/Makefile
+++ b/contrib/earthdistance/Makefile
 #
-# $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
--- a/contrib/findoidjoins/Makefile
+++ b/contrib/findoidjoins/Makefile
 #
-# $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)
--- a/contrib/fulltextindex/BENCH
+++ b/contrib/fulltextindex/BENCH
--- a/contrib/fulltextindex/Makefile
+++ b/contrib/fulltextindex/Makefile
 #
-# $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
--- a/contrib/isbn_issn/Makefile
+++ b/contrib/isbn_issn/Makefile
 #
-# $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
--- a/contrib/linux/Makefile
+++ b/contrib/linux/Makefile
-#
-# $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
--- a/contrib/lo/Makefile
+++ b/contrib/lo/Makefile
 #
-# $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
-
--- a/contrib/mSQL-interface/Makefile
+++ b/contrib/mSQL-interface/Makefile
 #
-# $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)
--- a/contrib/miscutil/Makefile
+++ b/contrib/miscutil/Makefile
 #
-# $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
--- a/contrib/noupdate/Makefile
+++ b/contrib/noupdate/Makefile
 #
-# $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
--- a/contrib/pg_dumplo/Makefile
+++ b/contrib/pg_dumplo/Makefile
 #
-# $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
--- a/contrib/pgbench/Makefile
+++ b/contrib/pgbench/Makefile
 #
-# $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)
--- a/contrib/soundex/Makefile
+++ b/contrib/soundex/Makefile
 #
-# $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
--- a/contrib/spi/Makefile
+++ b/contrib/spi/Makefile
 #
-# $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
-
-
--- a/contrib/spi/new_example.sql
+++ b/contrib/spi/new_example.sql
--- a/contrib/statmath/Makefile
+++ b/contrib/statmath/Makefile
 #
-# $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
--- a/contrib/string/Makefile
+++ b/contrib/string/Makefile
 #
-# $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
--- a/contrib/tips/Makefile
+++ b/contrib/tips/Makefile
 #
-# $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
--- a/contrib/tools/Makefile
+++ b/contrib/tools/Makefile
-#
-# $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) *~ 
-
--- a/contrib/unixdate/Makefile
+++ b/contrib/unixdate/Makefile
 #
-# $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
--- a/contrib/userlock/Makefile
+++ b/contrib/userlock/Makefile
 #
-# $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
--- a/contrib/vacuumlo/Makefile
+++ b/contrib/vacuumlo/Makefile
 #
-# $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
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -8,7 +8,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/doc/Makefile,v 1.15 2000/05/17 16:57:40 momjian Exp $
+#    $Header: /cvsroot/pgsql/doc/Makefile,v 1.16 2000/07/09 13:13:55 petere Exp $
 #
 #----------------------------------------------------------------------------

@@ -16,7 +16,6 @@ PGDOCS= $(POSTGRESDIR)/doc
 SRCDIR= ../src

 TAR= tar
-GZCAT= zcat

 # Pick up Makefile.global from the source area
 # This is the only resource from the code source area and is optional.
@@ -58,7 +57,7 @@ distclean::

 man::
 	-@if test ! -d $(POSTMANDIR) ; then mkdir $(POSTMANDIR) ; fi
-	$(GZCAT) man.tar.gz | (cd $(POSTMANDIR) ; $(TAR) xf - )
+	gunzip -c man.tar.gz | (cd $(POSTMANDIR) ; $(TAR) xf - )

 #
 # Generic production rules
@@ -75,5 +74,5 @@ man::
 %:	%.tar.gz
 	rm -rf ./$@ $(PGDOCS)/$*
 	if test ! -d $(PGDOCS)/$* ; then mkdir $(PGDOCS)/$* ; fi
-	$(GZCAT) $< | (cd $(PGDOCS)/$* ; $(TAR) xf - )
+	gunzip -c $< | (cd $(PGDOCS)/$* ; $(TAR) xf - )
 #	touch ./$*
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.85 2000/07/02 15:20:41 petere Exp $
+#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.86 2000/07/09 13:13:59 petere Exp $
 #
 # NOTES
 #    Essentially all Postgres make files include this file and use the
@@ -38,17 +38,23 @@
 # PostgreSQL version number
 VERSION = @VERSION@

+ifndef top_builddir
+top_builddir = $(SRCDIR)/..
+endif
+
 ifndef SRCDIR
+SRCDIR = $(top_builddir)/src
+endif
+
 # This should be changed once we have separate build dirs.
 top_srcdir = $(top_builddir)
+
 ifeq ($(top_builddir), $(top_srcdir))
 srcdir = .
 else
 srcdir = $(top_srcdir)/$(subdir)
 endif
 VPATH = $(srcdir)
-SRCDIR = $(top_builddir)/src
-endif

 ##############################################################################
 #
@@ -88,7 +94,9 @@ sharedstatedir = @sharedstatedir@
 localstatedir = @localstatedir@
 libdir = @libdir@
 includedir = @includedir@
+mandir = @mandir@

+docdir = ${prefix}/doc
 odbcinst_ini_dir = @odbcinst_ini_dir@

 # old variable names for installation directories
@@ -97,8 +105,8 @@ POSTGRESDIR= $(prefix)
 BINDIR= $(bindir)
 LIBDIR= $(libdir)
 TEMPLATEDIR= $(libdir)
-POSTMANDIR= $(POSTGRESDIR)/man
-POSTDOCDIR= $(POSTGRESDIR)/doc
+POSTMANDIR= $(mandir)
+POSTDOCDIR= $(docdir)
 HEADERDIR= $(includedir)


@@ -126,6 +134,8 @@ PYTHON = @PYTHON@
 python_extmakefile = @python_extmakefile@
 python_moduledir = @python_moduledir@

+krb_srvtab = @krb_srvtab@
+
 #
 # Please do not edit USE_TCL and USE_TK by hand.
 #
@@ -156,12 +166,6 @@ INSTALL_SHLIB = @INSTALL_SHLIB@

 mkinstalldirs = @mkinstalldirs@

-# don't use these any more
-INSTLOPTS= @INSTLOPTS@
-INSTL_EXE_OPTS= @INSTL_EXE_OPTS@
-INSTL_LIB_OPTS= @INSTL_LIB_OPTS@
-INSTL_SHLIB_OPTS= @INSTL_SHLIB_OPTS@
-
 RANLIB= @RANLIB@

 #-------------------------------------------------------------
@@ -184,11 +188,11 @@ LDOUT= -o
 DLSUFFIX= @DLSUFFIX@
 LN_S= @LN_S@
 TAR= @tar@
-GZCAT= @GZCAT@
 PERL = @PERL@
 AWK = @AWK@
 CXX=@CXX@
 CXXFLAGS=@CXXFLAGS@ @INCLUDES@
+GCC = @GCC@


 ##############################################################################
@@ -259,12 +263,6 @@ ifneq ($(CUSTOM_COPT),)
  COPT= $(CUSTOM_COPT)
 endif

-GCC = @GCC@
-
-ifeq ($(GCC), yes)
-CFLAGS+= -Wall -Wmissing-prototypes -Wmissing-declarations
-endif
-
 ifdef COPT
   CFLAGS+= $(COPT)
   LDFLAGS+= $(COPT)
@@ -284,3 +282,4 @@ SNPRINTF = @SNPRINTF@
 STRDUP = @STRDUP@

 .PHONY: all install installdirs uninstall dep depend clean distclean maintainer-clean
+.SILENT: installdirs
--- a/src/backend/libpq/Makefile
+++ b/src/backend/libpq/Makefile
@@ -4,11 +4,12 @@
 #    Makefile for libpq subsystem (backend half of libpq interface)
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.21 2000/07/08 03:04:39 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.22 2000/07/09 13:14:05 petere Exp $
 #
 #-------------------------------------------------------------------------

-SRCDIR = ../..
+subdir = src/backend/libpq
+top_builddir = ../..
 include ../../Makefile.global

 # be-fsstubs is here for historical reasons, probably belongs elsewhere
@@ -17,6 +18,12 @@ OBJS = be-fsstubs.o \
 	auth.o crypt.o hba.o password.o \
 	pqcomm.o pqformat.o pqpacket.o pqsignal.o util.o

+# This location might depend on the installation directories. Therefore
+# we can't subsitute it into config.h.
+ifdef krb_srvtab
+CPPFLAGS += -DPG_KRB_SRVTAB='"$(krb_srvtab)"'
+endif
+

 all: SUBSYS.o


--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -11,7 +11,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.153 2000/07/08 03:04:13 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.154 2000/07/09 13:14:05 petere Exp $
 *
 * NOTES
 *
@@ -86,11 +86,6 @@
 #include "utils/exc.h"
 #include "utils/guc.h"

-/*
- * "postmaster.opts" is a file containing options for postmaser.
- * pg_ctl will use it to restart postmaster.
- */
-#define OPTSFNAME	"postmaster.opts"

 #if !defined(MAXINT)
 #define MAXINT		   INT_MAX
@@ -246,7 +241,7 @@ extern int	optind,
 /*
 * postmaster.c - function prototypes
 */
-static void pmdaemonize(char *extraoptions);
+static void pmdaemonize(int argc, char *argv[]);
 static Port *ConnCreate(int serverFd);
 static void ConnFree(Port *port);
 static void reset_shared(int port);
@@ -267,15 +262,7 @@ static long PostmasterRandom(void);
 static void RandomSalt(char *salt);
 static void SignalChildren(SIGNAL_ARGS);
 static int	CountChildren(void);
-static int
-SetOptsFile(char *progname, int port, char *datadir,
-			int assert, int nbuf,
-			int debuglvl, int netserver,
-#ifdef USE_SSL
-			int securenetserver,
-#endif
-			int maxbackends, int reinit,
-			int silent, int sendstop, char *extraoptions);
+static bool CreateOptsFile(int argc, char *argv[]);

 extern int	BootstrapMain(int argc, char *argv[]);
 static pid_t SSDataBase(bool startup);
@@ -564,8 +551,8 @@ PostmasterMain(int argc, char *argv[])
 #ifdef USE_SSL
 	if (!NetServer && SecureNetServer)
 	{
-		fprintf(stderr, "For SSL, you must enable TCP/IP connections.\n",
-				argv[0]);
+		fprintf(stderr, "%s: For SSL, you must enable TCP/IP connections.\n",
+				progname);
 		exit(1);
 	}
 	InitSSL();
@@ -602,7 +589,7 @@ PostmasterMain(int argc, char *argv[])
 	PortList = DLNewList();

 	if (silentflag)
-		pmdaemonize(original_extraoptions);
+		pmdaemonize(argc, argv);
 	else
 	{

@@ -612,26 +599,7 @@ PostmasterMain(int argc, char *argv[])
 		SetPidFname(DataDir);
 		if (SetPidFile(getpid()) == 0)
 		{
-			if (SetOptsFile(
-							progname,	/* postmaster executable file */
-							PostPortName,		/* port number */
-							DataDir,	/* PGDATA */
-							assert_enabled,		/* whether -A is specified
-												 * or not */
-							NBuffers,	/* -B: number of shared buffers */
-							DebugLvl,	/* -d: debug level */
-							NetServer,	/* -i: accept connection from INET */
-#ifdef USE_SSL
-							SecureNetServer,	/* -l: use SSL */
-#endif
-							MaxBackends,		/* -N: max number of
-												 * backends */
-							Reinit,		/* -n: reinit shared mem after
-										 * failure */
-							silentflag, /* -S: detach tty */
-							SendStop,	/* -s: send SIGSTOP */
-							original_extraoptions		/* options for backend */
-							) != 0)
+			if (!CreateOptsFile(argc, argv))
 			{
 				UnlinkPidFile();
 				ExitPostmaster(1);
@@ -678,7 +646,7 @@ PostmasterMain(int argc, char *argv[])
 }

 static void
-pmdaemonize(char *extraoptions)
+pmdaemonize(int argc, char *argv[])
 {
 	int			i;
 	pid_t		pid;
@@ -700,26 +668,7 @@ pmdaemonize(char *extraoptions)
 		 */
 		if (SetPidFile(pid) == 0)
 		{
-			if (SetOptsFile(
-							progname,	/* postmaster executable file */
-							PostPortName,		/* port number */
-							DataDir,	/* PGDATA */
-							assert_enabled,		/* whether -A is specified
-												 * or not */
-							NBuffers,	/* -B: number of shared buffers */
-							DebugLvl,	/* -d: debug level */
-							NetServer,	/* -i: accept connection from INET */
-#ifdef USE_SSL
-							SecureNetServer,	/* -l: use SSL */
-#endif
-							MaxBackends,		/* -N: max number of
-												 * backends */
-							Reinit,		/* -n: reinit shared mem after
-										 * failure */
-							1,	/* -S: detach tty */
-							SendStop,	/* -s: send SIGSTOP */
-							extraoptions		/* options for backend */
-							) != 0)
+			if (!CreateOptsFile(argc, argv))
 			{

 				/*
@@ -2202,84 +2151,44 @@ SSDataBase(bool startup)
 	return (pid);
 }

+
 /*
 * Create the opts file
 */
-static int
-SetOptsFile(char *progname, int port, char *datadir,
-			int assert, int nbuf,
-			int debuglvl, int netserver,
-#ifdef USE_SSL
-			int securenetserver,
-#endif
-			int maxbackends, int reinit,
-			int silent, int sendstop, char *extraoptions)
+static bool
+CreateOptsFile(int argc, char *argv[])
 {
-	int			fd;
-	char		optsfile[MAXPGPATH];
-	char		opts[1024];
-	char		buf[1024];
+	char    fullprogname[MAXPGPATH];
+	char   *filename;
+	FILE   *fp;
+	unsigned i;

-	/*
-	 * Creating opts file
-	 */
-	snprintf(optsfile, sizeof(optsfile), "%s/%s", datadir, OPTSFNAME);
-	fd = open(optsfile, O_RDWR | O_TRUNC | O_CREAT, 0600);
-	if (fd < 0)
-	{
-		fprintf(stderr, "Can't create optsfile:%s", optsfile);
-		return (-1);
-	}
-	snprintf(opts, sizeof(opts), "%s\n-p %d\n-D %s\n", progname, port, datadir);
-	if (assert)
-	{
-		sprintf(buf, "-A %d\n", assert);
-		strcat(opts, buf);
-	}
+	if (FindExec(fullprogname, argv[0], "postmaster") == -1)
+		return false;

-	snprintf(buf, sizeof(buf), "-B %d\n", nbuf);
-	strcat(opts, buf);
+	filename = palloc(strlen(DataDir) + 20);
+	sprintf(filename, "%s/postmaster.opts", DataDir);

-	if (debuglvl)
+	fp = fopen(filename, "w");
+	if (fp == NULL)
 	{
-		sprintf(buf, "-d %d\n", debuglvl);
-		strcat(opts, buf);
+		fprintf(stderr, "%s: cannot create file %s: %s\n", progname,
+				filename, strerror(errno));
+		return false;
 	}

-	if (netserver)
-		strcat(opts, "-i\n");
-
-#ifdef USE_SSL
-	if (securenetserver)
-		strcat(opts, "-l\n");
-#endif
-
-	snprintf(buf, sizeof(buf), "-N %d\n", maxbackends);
-	strcat(opts, buf);
-
-	if (!reinit)
-		strcat(opts, "-n\n");
-
-	if (silent)
-		strcat(opts, "-S\n");
-
-	if (sendstop)
-		strcat(opts, "-s\n");
-
-	if (strlen(extraoptions) > 0)
-	{
-		strcat(opts, "-o '");
-		strcat(opts, extraoptions);
-		strcat(opts, "'");
-	}
+	fprintf(fp, "%s", fullprogname);
+	for (i = 1; i < argc; i++)
+		fprintf(fp, " '%s'", argv[i]);
+	fputs("\n", fp);

-	if (write(fd, opts, strlen(opts)) != strlen(opts))
+	if (ferror(fp))
 	{
-		perror("Writing to opts file failed");
-		close(fd);
-		return (-1);
+		fprintf(stderr, "%s: writing file %s failed\n", progname, filename);
+		fclose(fp);
+		return false;
 	}
-	close(fd);

-	return (0);
+	fclose(fp);
+	return true;
 }
--- a/src/backend/utils/init/findbe.c
+++ b/src/backend/utils/init/findbe.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/findbe.c,v 1.18 2000/06/08 22:37:33 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/findbe.c,v 1.19 2000/07/09 13:14:08 petere Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -151,7 +151,7 @@ ValidateBinary(char *path)
 * we change directories to the /data directory.
 */
 int
-FindExec(char *full_path, char *argv0, char *binary_name)
+FindExec(char *full_path, const char *argv0, const char *binary_name)
 {
 	char		buf[MAXPGPATH + 2];
 	char	   *p;

--- a/src/backend/utils/misc/ps_status.c
+++ b/src/backend/utils/misc/ps_status.c
@@ -5,7 +5,7 @@
 * to contain some useful information. Differs wildly across
 * platforms.
 *
- * $Header: /cvsroot/pgsql/src/backend/utils/misc/ps_status.c,v 1.1 2000/06/04 01:44:34 petere Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/ps_status.c,v 1.2 2000/07/09 13:14:11 petere Exp $
 *
 * Copyright 2000 by PostgreSQL Global Development Group
 * various details abducted from various places
@@ -20,11 +20,9 @@
 #ifdef HAVE_SYS_PSTAT_H
 # include <sys/pstat.h>			/* for HP-UX */
 #endif
-#ifdef HAVE_MACHINE_VMPARAM_H
+#ifdef HAVE_PS_STRINGS
 # include <machine/vmparam.h>	/* for old BSD */
-#endif
-#ifdef HAVE_SYS_EXEC_H
-# include <sys/exec.h>			/* for old BSD */
+# include <sys/exec.h>
 #endif

 #include "miscadmin.h"

--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -8,7 +8,7 @@
 * or in config.h afterwards.  Of course, if you edit config.h, then your
 * changes will be overwritten the next time you run configure.
 *
- * $Id: config.h.in,v 1.123 2000/07/05 17:44:29 scrappy Exp $
+ * $Id: config.h.in,v 1.124 2000/07/09 13:14:13 petere Exp $
 */

 #ifndef CONFIG_H
@@ -58,8 +58,8 @@
 /* Kerberos name of the Postgres service principal (--with-krb-srvnam=NAME) */
 #undef PG_KRB_SRVNAM

-/* Location of the Kerberos server's keytab file (--with-krb-srvtab=FILE) */
-#undef PG_KRB_SRVTAB
+/* Define to build with (Open)SSL support (--with-openssl[=DIR]) */
+#undef USE_SSL

 /* 
 * DEF_PGPORT is the TCP port number on which the Postmaster listens and

--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -12,7 +12,7 @@
 * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
 * Portions Copyright (c) 1994, Regents of the University of California
 *
- * $Id: miscadmin.h,v 1.62 2000/07/02 15:21:18 petere Exp $
+ * $Id: miscadmin.h,v 1.63 2000/07/09 13:14:13 petere Exp $
 *
 * NOTES
 *	  some of the information in this file will be moved to
@@ -133,7 +133,7 @@ extern char *getpgusername(void);
 extern void SetPgUserName(void);
 extern int	GetUserId(void);
 extern void SetUserId(void);
-extern int	FindExec(char *backend, char *argv0, char *binary_name);
+extern int	FindExec(char *full_path, const char *argv0, const char *binary_name);
 extern int	CheckPathAccess(char *path, char *name, int open_mode);

 /* lower case version for case-insensitive SQL referenced in pg_proc.h */

--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.130 2000/06/14 18:17:58 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.131 2000/07/09 13:14:17 petere Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -795,7 +795,7 @@ connectDBStart(PGconn *conn)
 		np.protoVersion = htonl(NEGOTIATE_SSL_CODE);
 		if (pqPacketSend(conn, (char *) &np, sizeof(StartupPacket)) != STATUS_OK)
 		{
-			sprintf(conn->errorMessage,
+			printfPQExpBuffer(&conn->errorMessage,
 					"connectDB() -- couldn't send SSL negotiation packet: errno=%d\n%s\n",
 					errno, strerror(errno));
 			goto connect_errReturn;
@@ -803,7 +803,7 @@ connectDBStart(PGconn *conn)
 		/* Now receive the postmasters response */
 		if (recv(conn->sock, &SSLok, 1, 0) != 1)
 		{
-			sprintf(conn->errorMessage, "PQconnectDB() -- couldn't read postmaster response: errno=%d\n%s\n",
+			printfPQExpBuffer(&conn->errorMessage, "PQconnectDB() -- couldn't read postmaster response: errno=%d\n%s\n",
 					errno, strerror(errno));
 			goto connect_errReturn;
 		}
@@ -816,7 +816,7 @@ connectDBStart(PGconn *conn)
 				SSL_context = SSL_CTX_new(SSLv23_method());
 				if (!SSL_context)
 				{
-					sprintf(conn->errorMessage,
+					printfPQExpBuffer(&conn->errorMessage,
 					  "connectDB() -- couldn't create SSL context: %s\n",
 							ERR_reason_error_string(ERR_get_error()));
 					goto connect_errReturn;
@@ -826,7 +826,7 @@ connectDBStart(PGconn *conn)
 				!SSL_set_fd(conn->ssl, conn->sock) ||
 				SSL_connect(conn->ssl) <= 0)
 			{
-				sprintf(conn->errorMessage,
+				printfPQExpBuffer(&conn->errorMessage,
 				"connectDB() -- couldn't establish SSL connection: %s\n",
 						ERR_reason_error_string(ERR_get_error()));
 				goto connect_errReturn;
@@ -844,7 +844,7 @@ connectDBStart(PGconn *conn)
 		}
 		else if (SSLok != 'N')
 		{
-			strcpy(conn->errorMessage,
+			printfPQExpBuffer(&conn->errorMessage,
 				   "Received invalid negotiation response.\n");
 			goto connect_errReturn;
 		}

--- a/src/test/regress/run_check.sh
+++ b/src/test/regress/run_check.sh
 #!/bin/sh
 #
-# $Header: /cvsroot/pgsql/src/test/regress/Attic/run_check.sh,v 1.21 2000/07/06 21:33:45 petere Exp $
+# $Header: /cvsroot/pgsql/src/test/regress/Attic/run_check.sh,v 1.22 2000/07/09 13:14:19 petere Exp $

 # ----------
 # Check call syntax
@@ -187,7 +187,7 @@ export PATH
 # Run initdb to initialize a database system in ./tmp_check
 # ----------
 echo "=============== Initializing check database instance   ================"
-initdb -D $PGDATA --noclean >$LOGDIR/initdb.log 2>&1
+initdb -D $PGDATA -L $CHKDIR/share --noclean >$LOGDIR/initdb.log 2>&1

 if [ $? -ne 0 ]
 then