diff --git a/src/GNUmakefile.in b/src/GNUmakefile.in
index 791e5a9509a9487724c93b12b7a9bc14af3c6bab..daa5f8e4219ebcc05820eb2cd9585aa9cb149a97 100644
--- a/src/GNUmakefile.in
+++ b/src/GNUmakefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.44 1999/10/12 14:46:26 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.45 1999/10/31 11:50:02 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -91,6 +91,7 @@ distclean: clean
 		backend/utils/Gen_fmgrtab.sh \
 		bin/pg_dump/Makefile \
 		bin/pg_version/Makefile \
+		bin/pgaccess/Makefile \
 		bin/psql/Makefile \
 		bin/pgtclsh/mkMakefile.tcldefs.sh \
 		bin/pgtclsh/mkMakefile.tkdefs.sh \
diff --git a/src/bin/pgaccess/Makefile b/src/bin/pgaccess/Makefile
deleted file mode 100644
index 16f6db2c0b873fe99cfc1a1bd09312bbff51a455..0000000000000000000000000000000000000000
--- a/src/bin/pgaccess/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile
-#    Makefile for pgaccess
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pgaccess/Attic/Makefile,v 1.5 1999/10/30 21:21:50 momjian Exp $
-#
-#-------------------------------------------------------------------------
-
-SRCDIR= ../..
-include $(SRCDIR)/Makefile.global
-
-.PHONY: all clean
-all clean: 
-
-.PHONY: install
-install:
-	$(INSTALL) $(INSTL_EXE_OPTS) pgaccess $(BINDIR)/pgaccess
diff --git a/src/bin/pgaccess/Makefile.in b/src/bin/pgaccess/Makefile.in
new file mode 100644
index 0000000000000000000000000000000000000000..fdce4b50bf4765750128b9b3523c299ddf129603
--- /dev/null
+++ b/src/bin/pgaccess/Makefile.in
@@ -0,0 +1,31 @@
+#-------------------------------------------------------------------------
+#
+# Makefile
+#    Makefile for pgaccess
+#
+# Copyright (c) 1994, Regents of the University of California
+#
+# IDENTIFICATION
+#    $Header: /cvsroot/pgsql/src/bin/pgaccess/Attic/Makefile.in,v 1.1 1999/10/31 11:50:03 momjian Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR= ../..
+include $(SRCDIR)/Makefile.global
+
+all: pgaccess
+
+pgaccess: pgaccess.sh
+	sed -e 's/__wish__/@wish@/' 			\
+	sed -e 's/__POSTGRESDIR__/$(POSTGRESDIR)/' 	\
+			pgaccess.sh > pgaccess
+
+install:
+	$(INSTALL) $(INSTL_EXE_OPTS) pgaccess $(BINDIR)/pgaccess
+	$(INSTALL) $(INSTL_EXE_OPTS) main.tcl $(POSTGRESDIR)/pgaccess
+	$(INSTALL) $(INSTL_EXE_OPTS) lib/* $(POSTGRESDIR)/pgaccess/lib
+#	$(INSTALL) $(INSTL_EXE_OPTS) lib/help/* $(POSTGRESDIR)/pgaccess/lib/help
+#	$(INSTALL) $(INSTL_EXE_OPTS) lib/languages/* $(POSTGRESDIR)/pgaccess/lib/languages
+
+clean:
+	rm -f pgaccess
diff --git a/src/bin/pgaccess/pgaccess b/src/bin/pgaccess/pgaccess
deleted file mode 100755
index 41fd5cae16fa79978fbe174981ac61dbd7838000..0000000000000000000000000000000000000000
--- a/src/bin/pgaccess/pgaccess
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-PATH_TO_WISH=/usr/bin/wish
-PGACCESS_HOME=/usr/local/pgaccess
-
-export PATH_TO_WISH
-export PGACCESS_HOME
-
-exec ${PATH_TO_WISH} ${PGACCESS_HOME}/main.tcl "$@"
-
diff --git a/src/bin/pgaccess/pgaccess.sh b/src/bin/pgaccess/pgaccess.sh
new file mode 100755
index 0000000000000000000000000000000000000000..0e5ced0705a5bcb3ed659e11540eeaf2c4c9fa4e
--- /dev/null
+++ b/src/bin/pgaccess/pgaccess.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+PATH_TO_WISH= __wish__
+PGACCESS_HOME=__POSTGRESDIR__/pgaccess
+
+export PATH_TO_WISH
+export PGACCESS_HOME
+
+exec $(PATH_TO_WISH) $(PGACCESS_HOME)/main.tcl "$@"
diff --git a/src/configure.in b/src/configure.in
index 115096f724fddea00b56959fca961a87af111970..b4185213ee460b51fc2592fa5e869f61f90d016e 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1120,6 +1120,7 @@ then
 	else
 		AC_MSG_RESULT($TK_CONFIG_SH)
 		AC_SUBST(TK_CONFIG_SH)
+		AC_PATH_PROG(wish, wish)
 	fi
 fi
 
@@ -1213,6 +1214,7 @@ AC_OUTPUT(
 	backend/utils/Gen_fmgrtab.sh
 	bin/pg_dump/Makefile
 	bin/pg_version/Makefile
+	bin/pgaccess/Makefile
 	bin/psql/Makefile
 	bin/pgtclsh/mkMakefile.tcldefs.sh
 	bin/pgtclsh/mkMakefile.tkdefs.sh