--- postgresql-6.3.1/doc/Makefile.rh	Wed Apr  1 19:55:27 1998
+++ postgresql-6.3.1/doc/Makefile	Wed Apr  1 19:59:09 1998
@@ -12,7 +12,7 @@
 #
 #----------------------------------------------------------------------------
 
-PGDOCS= /usr/local/cdrom/docs
+PGDOCS= unpacked
 SRCDIR= ../src
 
 TAR= tar
@@ -65,7 +65,7 @@
 
 %:	%.tar.gz
 	rm -rf ./$@ $(PGDOCS)/$*
-	if test ! -d $(PGDOCS)/$* ; then mkdir $(PGDOCS)/$* ; fi
+	if test ! -d $(PGDOCS)/$* ; then mkdir -p $(PGDOCS)/$* ; fi
 	$(TAR) zxf $< -C $(PGDOCS)/$*
 #	touch ./$*
 
--- postgresql-6.3.1/src/backend/Makefile.rh	Wed Apr  1 19:34:59 1998
+++ postgresql-6.3.1/src/backend/Makefile	Wed Apr  1 19:37:28 1998
@@ -125,32 +125,32 @@
 # and (2) the parameters of a database system should be set at initdb time,
 # not at postgres build time.
 
-install: $(LIBDIR) $(BINDIR) $(HEADERDIR) postgres $(POSTGRES_IMP) fmgr.h\
+install: $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(HEADERDIR) postgres $(POSTGRES_IMP) fmgr.h\
          global1.bki.source local1_template1.bki.source \
          global1.description local1_template1.description \
          libpq/pg_hba.conf.sample optimizer/geqo/pg_geqo.sample
-	$(INSTALL) $(INSTL_EXE_OPTS) postgres $(BINDIR)/postgres
+	$(INSTALL) $(INSTL_EXE_OPTS) postgres $(DESTDIR)$(BINDIR)/postgres
 ifeq ($(MAKE_EXPORTS), true)
-	$(INSTALL) $(INSTLOPTS) $(POSTGRES_IMP) $(LIBDIR)/$(POSTGRES_IMP)
+	$(INSTALL) $(INSTLOPTS) $(POSTGRES_IMP) $(DESTDIR)$(LIBDIR)/$(POSTGRES_IMP)
 endif
-	@rm -f $(BINDIR)/postmaster
-	ln -s postgres $(BINDIR)/postmaster
-	$(INSTALL) $(INSTLOPTS) fmgr.h $(HEADERDIR)/fmgr.h
+	@rm -f $(DESTDIR)$(BINDIR)/postmaster
+	ln -s postgres $(DESTDIR)$(BINDIR)/postmaster
+	$(INSTALL) $(INSTLOPTS) fmgr.h $(DESTDIR)$(HEADERDIR)/fmgr.h
 	$(INSTALL) $(INSTLOPTS) global1.bki.source \
-	  $(LIBDIR)/global1.bki.source
+	  $(DESTDIR)$(LIBDIR)/global1.bki.source
 	$(INSTALL) $(INSTLOPTS) global1.description \
-	  $(LIBDIR)/global1.description
+	  $(DESTDIR)$(LIBDIR)/global1.description
 	$(INSTALL) $(INSTLOPTS) local1_template1.bki.source \
-	  $(LIBDIR)/local1_template1.bki.source
+	  $(DESTDIR)$(LIBDIR)/local1_template1.bki.source
 	$(INSTALL) $(INSTLOPTS) local1_template1.description \
-	  $(LIBDIR)/local1_template1.description
+	  $(DESTDIR)$(LIBDIR)/local1_template1.description
 	$(INSTALL) $(INSTLOPTS) libpq/pg_hba.conf.sample \
-	  $(LIBDIR)/pg_hba.conf.sample
+	  $(DESTDIR)$(LIBDIR)/pg_hba.conf.sample
 	$(INSTALL) $(INSTLOPTS) optimizer/geqo/pg_geqo.sample \
-	  $(LIBDIR)/pg_geqo.sample
+	  $(DESTDIR)$(LIBDIR)/pg_geqo.sample
 
-$(BINDIR) $(LIBDIR) $(HEADERDIR): 
-	mkdir $@
+$(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(HEADERDIR): 
+	mkdir -p $@
 
 #############################################################################
 #
--- postgresql-6.3.1/src/interfaces/ecpg/lib/Makefile.in.rh	Thu Mar 19 22:07:17 1998
+++ postgresql-6.3.1/src/interfaces/ecpg/lib/Makefile.in	Mon Mar 30 20:29:15 1998
@@ -19,7 +19,7 @@
   ifdef LINUX_ELF
     install-shlib-dep := install-shlib
     shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
-    LDFLAGS_SL = -shared
+    LDFLAGS_SL = -shared -soname libecpg.so.$(SO_MAJOR_VERSION)
     CFLAGS += $(CFLAGS_SL)
   endif
 endif
--- postgresql-6.3.1/src/interfaces/libpgtcl/Makefile.in.rh	Mon Mar 23 09:33:35 1998
+++ postgresql-6.3.1/src/interfaces/libpgtcl/Makefile.in	Wed Apr  1 19:45:16 1998
@@ -36,7 +36,7 @@
     install-shlib-dep	:= install-shlib
     shlib		:= libpgtcl.so.1
     CFLAGS		+= $(CFLAGS_SL)
-    LDFLAGS_SL		= -shared -L$(SRCDIR)/interfaces/libpq -lpq
+    LDFLAGS_SL		= -shared -soname $(shlib) -L$(SRCDIR)/interfaces/libpq -lpq
   endif
 endif
 
@@ -86,10 +86,10 @@
 install: install-headers install-libpgtcl $(install-shlib-dep)
 
 install-headers: beforeinstall-headers libpgtcl.h
-	$(INSTALL) $(INSTLOPTS) libpgtcl.h $(HEADERDIR)/libpgtcl.h
+	$(INSTALL) $(INSTLOPTS) libpgtcl.h $(DESTDIR)$(HEADERDIR)/libpgtcl.h
 
 beforeinstall-headers:
-	@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
+	@if [ ! -d $(DESTDIR)$(HEADERDIR) ]; then mkdir -p $(DESTDIR)$(HEADERDIR); fi
 
 install-libpgtcl: libpgtcl.a
 	$(INSTALL) $(INSTL_LIB_OPTS) libpgtcl.a $(DESTDIR)$(LIBDIR)/libpgtcl.a
--- postgresql-6.3.1/src/interfaces/libpq/Makefile.in.rh	Thu Mar 19 23:07:02 1998
+++ postgresql-6.3.1/src/interfaces/libpq/Makefile.in	Wed Apr  1 19:42:08 1998
@@ -35,7 +35,7 @@
   ifdef LINUX_ELF
     install-shlib-dep := install-shlib
     shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
-    LDFLAGS_SL = -shared
+    LDFLAGS_SL = -shared -soname libpq.so.$(SO_MAJOR_VERSION)
     CFLAGS += $(CFLAGS_SL)
   endif
 endif
@@ -117,57 +117,57 @@
                  $(SRCDIR)/include/libpq/libpq-fs.h $(SRCDIR)/include/lib/dllist.h \
                  $(SRCDIR)/include/utils/geo_decls.h libpq-fe.h
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/os.h \
-          $(HEADERDIR)/os.h
+          $(DESTDIR)$(HEADERDIR)/os.h
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/config.h \
-          $(HEADERDIR)/config.h
+          $(DESTDIR)$(HEADERDIR)/config.h
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/postgres.h \
-          $(HEADERDIR)/postgres.h
+          $(DESTDIR)$(HEADERDIR)/postgres.h
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/postgres_ext.h \
-          $(HEADERDIR)/postgres_ext.h
+          $(DESTDIR)$(HEADERDIR)/postgres_ext.h
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/libpq/pqcomm.h \
-          $(HEADERDIR)/libpq/pqcomm.h
+          $(DESTDIR)$(HEADERDIR)/libpq/pqcomm.h
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/libpq/libpq-fs.h \
-          $(HEADERDIR)/libpq/libpq-fs.h
+          $(DESTDIR)$(HEADERDIR)/libpq/libpq-fs.h
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/lib/dllist.h \
-          $(HEADERDIR)/lib/dllist.h
+          $(DESTDIR)$(HEADERDIR)/lib/dllist.h
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/geo_decls.h \
-          $(HEADERDIR)/utils/geo_decls.h
+          $(DESTDIR)$(HEADERDIR)/utils/geo_decls.h
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/elog.h \
-          $(HEADERDIR)/utils/elog.h
+          $(DESTDIR)$(HEADERDIR)/utils/elog.h
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/palloc.h \
-          $(HEADERDIR)/utils/palloc.h
+          $(DESTDIR)$(HEADERDIR)/utils/palloc.h
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/access/attnum.h \
-          $(HEADERDIR)/access/attnum.h
+          $(DESTDIR)$(HEADERDIR)/access/attnum.h
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/executor/spi.h \
-          $(HEADERDIR)/executor/spi.h
+          $(DESTDIR)$(HEADERDIR)/executor/spi.h
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/commands/trigger.h \
-          $(HEADERDIR)/commands/trigger.h
-	$(INSTALL) $(INSTLOPTS) libpq-fe.h $(HEADERDIR)/libpq-fe.h
+          $(DESTDIR)$(HEADERDIR)/commands/trigger.h
+	$(INSTALL) $(INSTLOPTS) libpq-fe.h $(DESTDIR)$(HEADERDIR)/libpq-fe.h
 ifeq ($(PORTNAME), hpux)
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/backend/port/hpux/fixade.h \
-          $(HEADERDIR)/port/hpux/fixade.h
+          $(DESTDIR)$(HEADERDIR)/port/hpux/fixade.h
 endif
-	$(INSTALL) $(INSTLOPTS) c.h $(HEADERDIR)/c.h
+	$(INSTALL) $(INSTLOPTS) c.h $(DESTDIR)$(HEADERDIR)/c.h
 
 beforeinstall-headers:
-	@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
-	@if [ ! -d $(HEADERDIR)/port ]; then mkdir $(HEADERDIR)/port; fi
-	@if [ ! -d $(HEADERDIR)/port/$(PORTNAME) ]; \
-		then mkdir $(HEADERDIR)/port/$(PORTNAME); fi
-	@if [ ! -d $(HEADERDIR)/include ]; \
-		then mkdir $(HEADERDIR)/include; fi
-	@if [ ! -d $(HEADERDIR)/lib ]; \
-		then mkdir $(HEADERDIR)/lib; fi
-	@if [ ! -d $(HEADERDIR)/libpq ]; \
-		then mkdir $(HEADERDIR)/libpq; fi
-	@if [ ! -d $(HEADERDIR)/utils ]; \
-		then mkdir $(HEADERDIR)/utils; fi
-	@if [ ! -d $(HEADERDIR)/access ]; \
-		then mkdir $(HEADERDIR)/access; fi
-	@if [ ! -d $(HEADERDIR)/executor ]; \
-		then mkdir $(HEADERDIR)/executor; fi
-	@if [ ! -d $(HEADERDIR)/commands ]; \
-		then mkdir $(HEADERDIR)/commands; fi
+	@if [ ! -d $(DESTDIR)$(HEADERDIR) ]; then mkdir -p $(DESTDIR)$(HEADERDIR); fi
+	@if [ ! -d $(DESTDIR)$(HEADERDIR)/port ]; then mkdir $(DESTDIR)$(HEADERDIR)/port; fi
+	@if [ ! -d $(DESTDIR)$(HEADERDIR)/port/$(PORTNAME) ]; \
+		then mkdir -p $(DESTDIR)$(HEADERDIR)/port/$(PORTNAME); fi
+	@if [ ! -d $(DESTDIR)$(HEADERDIR)/include ]; \
+		then mkdir $(DESTDIR)$(HEADERDIR)/include; fi
+	@if [ ! -d $(DESTDIR)$(HEADERDIR)/lib ]; \
+		then mkdir $(DESTDIR)$(HEADERDIR)/lib; fi
+	@if [ ! -d $(DESTDIR)$(HEADERDIR)/libpq ]; \
+		then mkdir $(DESTDIR)$(HEADERDIR)/libpq; fi
+	@if [ ! -d $(DESTDIR)$(HEADERDIR)/utils ]; \
+		then mkdir $(DESTDIR)$(HEADERDIR)/utils; fi
+	@if [ ! -d $(DESTDIR)$(HEADERDIR)/access ]; \
+		then mkdir $(DESTDIR)$(HEADERDIR)/access; fi
+	@if [ ! -d $(DESTDIR)$(HEADERDIR)/executor ]; \
+		then mkdir $(DESTDIR)$(HEADERDIR)/executor; fi
+	@if [ ! -d $(DESTDIR)$(HEADERDIR)/commands ]; \
+		then mkdir $(DESTDIR)$(HEADERDIR)/commands; fi
 
 install-libpq: libpq.a
 	$(INSTALL) $(INSTL_LIB_OPTS) libpq.a $(DESTDIR)$(LIBDIR)/libpq.a
--- postgresql-6.3.1/src/interfaces/libpq++/man/Makefile.rh	Wed Apr  1 19:43:25 1998
+++ postgresql-6.3.1/src/interfaces/libpq++/man/Makefile	Wed Apr  1 19:43:46 1998
@@ -12,7 +12,7 @@
 include ../../../Makefile.global
 
 install: 
-	-mkdir -p $(POSTMANDIR)
-	-mkdir $(POSTMANDIR)/man3
-	cp *.3* $(POSTMANDIR)/man3
+	-mkdir -p $(DESTDIR)$(POSTMANDIR)
+	-mkdir $(DESTDIR)$(POSTMANDIR)/man3
+	cp *.3* $(DESTDIR)$(POSTMANDIR)/man3
 
--- postgresql-6.3.1/src/interfaces/libpq++/Makefile.rh	Thu Mar 19 23:07:11 1998
+++ postgresql-6.3.1/src/interfaces/libpq++/Makefile	Wed Apr  1 19:27:08 1998
@@ -45,7 +45,13 @@
 ifeq ($(PORTNAME), i386_solaris)
   INSTALL-SHLIB-DEP := install-shlib
   SHLIB := libpq++.so.1
-  LDFLAGS_SL = -G -z text
+  LDFLAGS_SL = -G -z text -shared -soname $(SHLIB)
+  CFLAGS += $(CFLAGS_SL)
+endif
+ifeq ($(PORTNAME), linux)
+  INSTALL-SHLIB-DEP := install-shlib
+  SHLIB := libpq++.so.1
+  LDFLAGS_SL = -shared -soname $(SHLIB)
   CFLAGS += $(CFLAGS_SL)
 endif
 ifeq ($(PORTNAME), hpux)
@@ -55,7 +61,7 @@
   CFLAGS += $(CFLAGS_SL)
 endif
 
-all: $(LIBNAME).a $(SHLIB) install examples
+all: $(LIBNAME).a $(SHLIB)
 
 $(LIBNAME).a: $(OBJS)
 ifdef MK_NO_LORDER
@@ -88,18 +94,18 @@
 		 pglobject.h
 
 install-headers: beforeinstall-headers $(MAINHEADER)
-	@$(INSTALL) $(INSTLOPTS) $(MAINHEADER) $(HEADERDIR)/$(MAINHEADER)
+	@$(INSTALL) $(INSTLOPTS) $(MAINHEADER) $(DESTDIR)/$(HEADERDIR)/$(MAINHEADER)
 	@for i in ${LIBPGXXHEADERS}; do \
 		echo "Installing $(LIBPGXXHEADERDIR)/$$i."; \
-		$(INSTALL) $(INSTLOPTS) $$i $(LIBPGXXHEADERDIR)/$$i; \
+		$(INSTALL) $(INSTLOPTS) $$i $(DESTDIR)/$(LIBPGXXHEADERDIR)/$$i; \
 	done
 
 beforeinstall-headers:
-	@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
-	@if [ ! -d $(LIBPGXXHEADERDIR) ]; then mkdir $(LIBPGXXHEADERDIR); fi
+	@if [ ! -d $(DESTDIR)/$(HEADERDIR) ]; then mkdir -p $(DESTDIR)/$(HEADERDIR); fi
+	@if [ ! -d $(DESTDIR)/$(LIBPGXXHEADERDIR) ]; then mkdir -p $(DESTDIR)/$(LIBPGXXHEADERDIR); fi
 
 beforeinstall-lib:
-	@if [ ! -d $(DESTDIR)/$(LIBDIR) ] ; then mkdir $(DESTDIR)/$(LIBDIR); fi
+	@if [ ! -d $(DESTDIR)/$(LIBDIR) ] ; then mkdir -p $(DESTDIR)/$(LIBDIR); fi
 
 install-$(LIBNAME): $(LIBNAME).a beforeinstall-lib
 	$(INSTALL) $(INSTL_LIB_OPTS) $(LIBNAME).a $(DESTDIR)$(LIBDIR)/$(LIBNAME).a
--- postgresql-6.3.1/src/interfaces/perl5/Makefile.PL.rh	Fri Feb 20 16:25:32 1998
+++ postgresql-6.3.1/src/interfaces/perl5/Makefile.PL	Mon Mar 30 20:29:15 1998
@@ -14,27 +14,12 @@
 print "Remember to actually read the README file !\n";
 die "\nYou didn't read the README file !\n" unless ($] >= 5.002);
 
-if (! $ENV{POSTGRES_HOME}) {
-    warn "\$POSTGRES_HOME not defined. Searching for PostgreSQL...\n";
-    foreach(qw(/usr/local/pgsql /usr/pgsql /home/pgsql /opt/pgsql /usr/local/postgres /usr/postgres /home/postgres /opt/postgres)) {
-        if (-d "$_/lib") {
-            $ENV{POSTGRES_HOME} = $_;
-            last;
-        }
-    }
-}
-
-if (-d "$ENV{POSTGRES_HOME}/lib") {
-    print "Found PostgreSQL in $ENV{POSTGRES_HOME}\n";
-} else {
-    die "Unable to determine PostgreSQL\n";
-}
-
 my %opts = (
     NAME         => 'Pg',
     VERSION_FROM => 'Pg.pm',
-    INC	         =>  "-I$ENV{POSTGRES_HOME}/include",
-    LIBS         => ["-L$ENV{POSTGRES_HOME}/lib -lpq"],
+    INC	         =>  "-I../libpq -I../../include",
+    LIBS         => ["-L../libpq -lpq"],
+    CC		 => 'gcc',
 );
 
 
--- postgresql-6.3.1/src/interfaces/Makefile.rh	Thu Mar  5 08:18:51 1998
+++ postgresql-6.3.1/src/interfaces/Makefile	Wed Apr  1 19:46:43 1998
@@ -25,7 +25,7 @@
 ifeq ($(USE_TCL), true)
 	$(MAKE) -C libpgtcl $@
 endif
-ifeq ($(USE_PERL), true)
-	cd perl5 && perl Makefile.PL
-	$(MAKE) -C perl5 $@
-endif
+#ifeq ($(USE_PERL), true)
+#	cd perl5 && perl Makefile.PL
+#	$(MAKE) -C perl5 $@
+#endif
--- postgresql-6.3.1/src/man/Makefile.rh	Wed Apr  1 19:47:42 1998
+++ postgresql-6.3.1/src/man/Makefile	Wed Apr  1 19:48:16 1998
@@ -16,15 +16,15 @@
 include ../Makefile.global
 
 install-man:
-	-mkdir -p $(POSTMANDIR)
-	-mkdir $(POSTMANDIR)/man1
-	-mkdir $(POSTMANDIR)/man3
-	-mkdir $(POSTMANDIR)/man5
-	-mkdir $(POSTMANDIR)/manl
-	cp *.1* $(POSTMANDIR)/man1
-	cp *.3* $(POSTMANDIR)/man3
-	cp *.5* $(POSTMANDIR)/man5
-	cp *.l* $(POSTMANDIR)/manl
+	-mkdir -p $(DESTDIR)$(POSTMANDIR)
+	-mkdir $(DESTDIR)$(POSTMANDIR)/man1
+	-mkdir $(DESTDIR)$(POSTMANDIR)/man3
+	-mkdir $(DESTDIR)$(POSTMANDIR)/man5
+	-mkdir $(DESTDIR)$(POSTMANDIR)/manl
+	cp *.1* $(DESTDIR)$(POSTMANDIR)/man1
+	cp *.3* $(DESTDIR)$(POSTMANDIR)/man3
+	cp *.5* $(DESTDIR)$(POSTMANDIR)/man5
+	cp *.l* $(DESTDIR)$(POSTMANDIR)/manl
 
 install:: install-man
 
--- postgresql-6.3.1/src/makefiles/Makefile.linux.rh	Wed Feb 18 02:15:23 1998
+++ postgresql-6.3.1/src/makefiles/Makefile.linux	Mon Mar 30 20:29:15 1998
@@ -2,7 +2,7 @@
 # test for __ELF__ in C code so do not need LINUX_ELF defined
 # - thomas 1997-12-29
 #CFLAGS+= -DLINUX_ELF
-LDFLAGS+= -export-dynamic -Wl,-rpath -Wl,$(DESTDIR)$(LIBDIR)
+LDFLAGS+= -export-dynamic #-Wl,-rpath -Wl,$(DESTDIR)$(LIBDIR)
 endif
 MK_NO_LORDER= true
 
--- postgresql-6.3.1/src/configure.in.rh	Mon Mar 23 09:33:33 1998
+++ postgresql-6.3.1/src/configure.in	Mon Mar 30 20:29:15 1998
@@ -112,7 +112,7 @@
 	ls template
 	echo "**************************************************************"
 	$ECHO_N "Appropriate template file { $TEMPLATE }: $ECHO_C"
-	read a
+	# read a
 	if test "$a." != "."
 	then
 		TEMPLATE=$a
@@ -158,7 +158,8 @@
 	a=$SRCH_INC
 	echo ""
 else
-	read a
+	# read a
+	echo ""
 fi
 if test "$a." = "none." 
 then
@@ -181,7 +182,8 @@
 	a=$SRCH_LIB
 	echo ""
 else
-	read a
+	# read a
+	echo ""
 fi
 if test "$a." = "none."
 then
@@ -615,7 +617,7 @@
 if test "$USE_TCL" = "true"
 then
 TK_LIB=
-AC_CHECK_LIB(tk, main, TK_LIB=tk)
+AC_CHECK_LIB(tk, main, TK_LIB=tk,,-L/usr/X11R6/lib $X11_LIBS -ltcl)
 if test -z "$TK_LIB"; then
 AC_MSG_WARN(tcl support disabled; Tk library missing)
 USE_TCL=