diff -uNr postgresql-7.0.orig/src/bin/pg_ctl/postmaster.opts.default.sample postgresql-7.0/src/bin/pg_ctl/postmaster.opts.default.sample
--- postgresql-7.0.orig/src/bin/pg_ctl/postmaster.opts.default.sample	Sun Apr 16 23:45:17 2000
+++ postgresql-7.0/src/bin/pg_ctl/postmaster.opts.default.sample	Thu May 25 22:11:38 2000
@@ -1 +1,2 @@
+-i
 
diff -uNr postgresql-7.0.orig/src/bin/pgaccess/pgaccess.sh postgresql-7.0/src/bin/pgaccess/pgaccess.sh
--- postgresql-7.0.orig/src/bin/pgaccess/pgaccess.sh	Fri Mar 31 09:05:07 2000
+++ postgresql-7.0/src/bin/pgaccess/pgaccess.sh	Thu May 25 22:11:38 2000
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 PATH_TO_WISH=__wish__
-PGACCESS_HOME=__POSTGRESDIR__/pgaccess
+PGACCESS_HOME=/usr/lib/pgsql/pgaccess
 
 export PATH_TO_WISH
 export PGACCESS_HOME
diff -uNr postgresql-7.0.orig/src/include/config.h.in postgresql-7.0/src/include/config.h.in
--- postgresql-7.0.orig/src/include/config.h.in	Sun Apr 16 23:45:24 2000
+++ postgresql-7.0/src/include/config.h.in	Thu May 25 22:11:38 2000
@@ -161,7 +161,7 @@
  * ELOG_TIMESTAMPS: adds a timestamp with the following format to elog
  * messages:  yymmdd.hh:mm:ss.mmm [pid] message
  */
-/* #define ELOG_TIMESTAMPS */
+#define ELOG_TIMESTAMPS 
 
 /*
  * USE_SYSLOG: use syslog for elog and error messages printed by tprintf
@@ -169,7 +169,7 @@
  * (syslog=0 for stdio, syslog=1 for stdio+syslog, syslog=2 for syslog).
  * For information see backend/utils/misc/trace.c (Massimo Dal Zotto).
  */
-/* #define USE_SYSLOG */
+#define USE_SYSLOG
 
 /* Debug #defines */
 /* #define IPORTAL_DEBUG  */
diff -uNr postgresql-7.0.orig/src/interfaces/perl5/eg/ApachePg.pl postgresql-7.0/src/interfaces/perl5/eg/ApachePg.pl
--- postgresql-7.0.orig/src/interfaces/perl5/eg/ApachePg.pl	Sun Sep 27 15:12:33 1998
+++ postgresql-7.0/src/interfaces/perl5/eg/ApachePg.pl	Thu May 25 22:11:38 2000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 
 # $Id: ApachePg.pl,v 1.5 1998/09/27 19:12:33 mergl Exp $
 
diff -uNr postgresql-7.0.orig/src/interfaces/perl5/eg/example.newstyle postgresql-7.0/src/interfaces/perl5/eg/example.newstyle
--- postgresql-7.0.orig/src/interfaces/perl5/eg/example.newstyle	Sun Sep 27 15:12:34 1998
+++ postgresql-7.0/src/interfaces/perl5/eg/example.newstyle	Thu May 25 22:11:38 2000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 
 # $Id: example.newstyle,v 1.6 1998/09/27 19:12:34 mergl Exp $
 
diff -uNr postgresql-7.0.orig/src/interfaces/perl5/eg/example.oldstyle postgresql-7.0/src/interfaces/perl5/eg/example.oldstyle
--- postgresql-7.0.orig/src/interfaces/perl5/eg/example.oldstyle	Sun Sep 27 15:12:35 1998
+++ postgresql-7.0/src/interfaces/perl5/eg/example.oldstyle	Thu May 25 22:11:38 2000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 
 # $Id: example.oldstyle,v 1.6 1998/09/27 19:12:35 mergl Exp $
 
diff -uNr postgresql-7.0.orig/src/interfaces/perl5/test.pl postgresql-7.0/src/interfaces/perl5/test.pl
--- postgresql-7.0.orig/src/interfaces/perl5/test.pl	Fri Mar 10 21:57:24 2000
+++ postgresql-7.0/src/interfaces/perl5/test.pl	Thu May 25 22:11:38 2000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl -w
 
 # $Id: test.pl,v 1.12 2000/03/11 02:57:24 tgl Exp $
 
diff -uNr postgresql-7.0.orig/src/interfaces/python/mkdefines postgresql-7.0/src/interfaces/python/mkdefines
--- postgresql-7.0.orig/src/interfaces/python/mkdefines	Mon May 17 02:15:27 1999
+++ postgresql-7.0/src/interfaces/python/mkdefines	Thu May 25 22:11:38 2000
@@ -1,4 +1,4 @@
-#! /usr/local/bin/python
+#! /usr/bin/python
 
 import string
 
diff -uNr postgresql-7.0.orig/src/interfaces/python/tutorial/advanced.py postgresql-7.0/src/interfaces/python/tutorial/advanced.py
--- postgresql-7.0.orig/src/interfaces/python/tutorial/advanced.py	Mon May 17 02:06:28 1999
+++ postgresql-7.0/src/interfaces/python/tutorial/advanced.py	Thu May 25 22:11:38 2000
@@ -1,4 +1,4 @@
-#! /usr/local/bin/python
+#! /usr/bin/python
 # advanced.py - demo of advanced features of PostGres. Some may not be ANSI.
 # inspired from the Postgres tutorial 
 # adapted to Python 1995 by Pascal Andre
diff -uNr postgresql-7.0.orig/src/interfaces/python/tutorial/basics.py postgresql-7.0/src/interfaces/python/tutorial/basics.py
--- postgresql-7.0.orig/src/interfaces/python/tutorial/basics.py	Mon May 17 02:06:30 1999
+++ postgresql-7.0/src/interfaces/python/tutorial/basics.py	Thu May 25 22:11:38 2000
@@ -1,4 +1,4 @@
-#! /usr/local/bin/python
+#! /usr/bin/python
 # basics.py - basic SQL commands tutorial
 # inspired from the Postgres95 tutorial 
 # adapted to Python 1995 by Pascal ANDRE
diff -uNr postgresql-7.0.orig/src/interfaces/python/tutorial/pgtools.py postgresql-7.0/src/interfaces/python/tutorial/pgtools.py
--- postgresql-7.0.orig/src/interfaces/python/tutorial/pgtools.py	Mon May 17 02:06:34 1999
+++ postgresql-7.0/src/interfaces/python/tutorial/pgtools.py	Thu May 25 22:11:38 2000
@@ -1,4 +1,4 @@
-#! /usr/local/bin/python
+#! /usr/bin/python
 # pgtools.py - valuable functions for PostGreSQL tutorial
 # written 1995 by Pascal ANDRE
 
diff -uNr postgresql-7.0.orig/src/pl/plperl/Makefile.PL postgresql-7.0/src/pl/plperl/Makefile.PL
--- postgresql-7.0.orig/src/pl/plperl/Makefile.PL	Sat Apr 29 13:45:42 2000
+++ postgresql-7.0/src/pl/plperl/Makefile.PL	Thu May 25 22:12:45 2000
@@ -4,31 +4,6 @@
 use Config;
 
 #
-# Can't build a shared plperl unless libperl is shared too.
-# (Actually, it would be enough if code in libperl.a is compiled
-# to be position-independent, but that is hard to check for and
-# seems pretty unlikely anyway.)
-#
-if ($Config{'useshrplib'} ne 'true') {
-	open(OUT, ">Makefile") or die "Can't write Makefile: $!\n";
-	print OUT <<'EndOfMakefile';
-# Dummy Makefile for use when we can't build plperl
-
-all install:
-	@echo "Cannot build plperl because libperl is not a shared library; skipping it."
-
-clean distclean:
-	rm -f Makefile
-
-.DEFAULT dep depend:
-
-EndOfMakefile
-	close(OUT);
-	exit(0);
-}
-
-
-#
 # get the location of the Opcode module
 #
 my $opcode = '';
@@ -50,7 +25,7 @@
 
 }
 
-my $perllib = "-L$Config{archlibexp}/CORE -lperl";
+my $perllib = "-L$Config{archlibexp}/CORE -L. -lperl";
 
 WriteMakefile( 'NAME' => 'plperl', 
 	dynamic_lib => { 'OTHERLDFLAGS' => "$opcode $perllib" } ,
diff -uNr postgresql-7.0.orig/src/test/locale/sort-test.pl postgresql-7.0/src/test/locale/sort-test.pl
--- postgresql-7.0.orig/src/test/locale/sort-test.pl	Tue Jun 16 02:41:55 1998
+++ postgresql-7.0/src/test/locale/sort-test.pl	Thu May 25 22:11:38 2000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl -w
 use locale;
 
 open(INFILE, "<$ARGV[0]");
diff -uNr postgresql-7.0.orig/src/test/locale/sort-test.py postgresql-7.0/src/test/locale/sort-test.py
--- postgresql-7.0.orig/src/test/locale/sort-test.py	Tue Jun 16 02:41:55 1998
+++ postgresql-7.0/src/test/locale/sort-test.py	Thu May 25 22:11:38 2000
@@ -1,4 +1,4 @@
-#! /usr/local/bin/python
+#! /usr/bin/python
 
 import sys, string, locale
 locale.setlocale(locale.LC_ALL, "")
diff -uNr postgresql-7.0.orig/src/test/performance/runtests.pl postgresql-7.0/src/test/performance/runtests.pl
--- postgresql-7.0.orig/src/test/performance/runtests.pl	Fri Sep 26 10:55:20 1997
+++ postgresql-7.0/src/test/performance/runtests.pl	Thu May 25 22:11:38 2000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 #
 # Accepts one argument - DBMS name (pgsql, ...) and initializes
 # global variable $TestDBMS with this name.
diff -uNr postgresql-7.0.orig/src/test/regress/input/Makefile postgresql-7.0/src/test/regress/input/Makefile
--- postgresql-7.0.orig/src/test/regress/input/Makefile	Sun Jan  9 14:34:40 2000
+++ postgresql-7.0/src/test/regress/input/Makefile	Thu May 25 22:11:38 2000
@@ -27,11 +27,9 @@
 all: $(INFILES)
 
 %.sql: %.source
-	if [ -z "$$USER" ]; then USER=$$LOGNAME; fi; \
-	if [ -z "$$USER" ]; then USER=`whoami`; fi; \
-	if [ -z "$$USER" ]; then echo 'Cannot deduce $$USER.'; exit 1; fi; \
+	USER='postgres'; \
 	rm -f $@; \
-	OBJ=`pwd`; \
+	OBJ='/usr/lib/pgsql/test/regress/input'; \
 	sed -e "s:_OBJWD_:$$OBJ/\.\.:g" \
 	    -e "s:_DLSUFFIX_:$(DLSUFFIX):g" \
 	    -e "s:_LIBDIR_:$(LIBDIR):g" \
diff -uNr postgresql-7.0.orig/src/test/regress/input/create_function_1.source postgresql-7.0/src/test/regress/input/create_function_1.source
--- postgresql-7.0.orig/src/test/regress/input/create_function_1.source	Wed Jan  5 12:31:46 2000
+++ postgresql-7.0/src/test/regress/input/create_function_1.source	Thu May 25 22:11:38 2000
@@ -14,17 +14,17 @@
 
 CREATE FUNCTION check_primary_key ()
 	RETURNS opaque
-	AS '_OBJWD_/../../../contrib/spi/refint_DLSUFFIX_'
+	AS '_OBJWD_/refint_DLSUFFIX_'
 	LANGUAGE 'c';
 
 CREATE FUNCTION check_foreign_key ()
 	RETURNS opaque
-	AS '_OBJWD_/../../../contrib/spi/refint_DLSUFFIX_'
+	AS '_OBJWD_/refint_DLSUFFIX_'
 	LANGUAGE 'c';
 
 CREATE FUNCTION autoinc ()
 	RETURNS opaque
-	AS '_OBJWD_/../../../contrib/spi/autoinc_DLSUFFIX_'
+	AS '_OBJWD_/autoinc_DLSUFFIX_'
 	LANGUAGE 'c';
 
 CREATE FUNCTION funny_dup17 ()
diff -uNr postgresql-7.0.orig/src/test/regress/output/Makefile postgresql-7.0/src/test/regress/output/Makefile
--- postgresql-7.0.orig/src/test/regress/output/Makefile	Sun Jan  9 14:34:40 2000
+++ postgresql-7.0/src/test/regress/output/Makefile	Thu May 25 22:11:38 2000
@@ -27,11 +27,9 @@
 all: $(INFILES)
 
 %.out: %.source
-	if [ -z "$$USER" ]; then USER=$$LOGNAME; fi; \
-	if [ -z "$$USER" ]; then USER=`whoami`; fi; \
-	if [ -z "$$USER" ]; then echo 'Cannot deduce $$USER.'; exit 1; fi; \
+	USER='postgres'; \
 	rm -f $@; \
-	OBJ=`pwd`; \
+	OBJ='/usr/lib/pgsql/test/regress/output'; \
 	sed -e "s:_OBJWD_:$$OBJ/\.\.:g" \
 	    -e "s:_DLSUFFIX_:$(DLSUFFIX):g" \
 	    -e "s:_LIBDIR_:$(LIBDIR):g" \
diff -uNr postgresql-7.0.orig/src/test/regress/output/create_function_1.source postgresql-7.0/src/test/regress/output/create_function_1.source
--- postgresql-7.0.orig/src/test/regress/output/create_function_1.source	Sat Jan 15 14:18:24 2000
+++ postgresql-7.0/src/test/regress/output/create_function_1.source	Thu May 25 22:11:38 2000
@@ -12,15 +12,15 @@
    LANGUAGE 'c';
 CREATE FUNCTION check_primary_key ()
 	RETURNS opaque
-	AS '_OBJWD_/../../../contrib/spi/refint_DLSUFFIX_'
+	AS '_OBJWD_/refint_DLSUFFIX_'
 	LANGUAGE 'c';
 CREATE FUNCTION check_foreign_key ()
 	RETURNS opaque
-	AS '_OBJWD_/../../../contrib/spi/refint_DLSUFFIX_'
+	AS '_OBJWD_/refint_DLSUFFIX_'
 	LANGUAGE 'c';
 CREATE FUNCTION autoinc ()
 	RETURNS opaque
-	AS '_OBJWD_/../../../contrib/spi/autoinc_DLSUFFIX_'
+	AS '_OBJWD_/autoinc_DLSUFFIX_'
 	LANGUAGE 'c';
 CREATE FUNCTION funny_dup17 ()
         RETURNS opaque
diff -uNr postgresql-7.0.orig/src/test/regress/regress.sh postgresql-7.0/src/test/regress/regress.sh
--- postgresql-7.0.orig/src/test/regress/regress.sh	Mon Apr 10 00:13:15 2000
+++ postgresql-7.0/src/test/regress/regress.sh	Thu May 25 22:11:38 2000
@@ -32,6 +32,8 @@
 PGDATESTYLE="Postgres,US"; export PGDATESTYLE
 LANG= ; export LANG
 LC_ALL= ; export LC_ALL
+PGDATA="/var/lib/pgsql/data"; export PGDATA
+PGLIB="/usr/lib/pgsql"; export PGLIB
 
 FRONTEND="psql $HOSTLOC -a -q -X"