diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 472e2802b5d0e560685f55dc4ffb10f493d7752f..98d4156ea7552f6187f7122002a9d979032b8a04 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.58 1999/09/09 19:39:00 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.59 1999/10/31 19:50:46 momjian Exp $
 #
 # NOTES
 #    Essentially all Postgres make files include this file and use the
@@ -145,6 +145,7 @@ endif
 #
 USE_TCL= @USE_TCL@
 USE_TK= @USE_TK@
+WISH= @wish@
 
 USE_PERL= @USE_PERL@
 PERL=perl
diff --git a/src/bin/pgaccess/Makefile.in b/src/bin/pgaccess/Makefile
similarity index 79%
rename from src/bin/pgaccess/Makefile.in
rename to src/bin/pgaccess/Makefile
index 658602d937817ba025a768c5c7e7c74c4d20d34b..525c3934063644a04e885820204499fd8f64e631 100644
--- a/src/bin/pgaccess/Makefile.in
+++ b/src/bin/pgaccess/Makefile
@@ -6,7 +6,7 @@
 # Copyright (c) 1994, Regents of the University of California
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pgaccess/Attic/Makefile.in,v 1.2 1999/10/31 12:23:41 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pgaccess/Attic/Makefile,v 1.7 1999/10/31 19:50:47 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -16,7 +16,7 @@ include $(SRCDIR)/Makefile.global
 all: pgaccess
 
 pgaccess: pgaccess.sh
-	sed -e 's;__wish__;@wish@;' pgaccess.sh |	\
+	sed -e 's;__wish__;$(WISH);' pgaccess.sh |	\
 	sed -e 's;__POSTGRESDIR__;$(POSTGRESDIR);' 	\
 			> pgaccess
 
@@ -30,6 +30,8 @@ install:
 	$(INSTALL) $(INSTLOPTS) lib/help/*.hlp $(POSTGRESDIR)/pgaccess/lib/help
 	@if [ ! -d $(POSTGRESDIR)/pgaccess/lib/languages ]; then mkdir $(POSTGRESDIR)/pgaccess/lib/languages; fi
 	$(INSTALL) $(INSTLOPTS) lib/languages/[a-z]* $(POSTGRESDIR)/pgaccess/lib/languages
+	@if [ ! -d $(POSTGRESDIR)/pgaccess/images ]; then mkdir $(POSTGRESDIR)/pgaccess/images; fi
+	$(INSTALL) $(INSTLOPTS) images/*.gif $(POSTGRESDIR)/pgaccess/images
 
 clean:
 	rm -f pgaccess
diff --git a/src/configure.in b/src/configure.in
index de38c95e40aba0fea8fc7466094232f687314488..b4f2d75427962fd125558559d1335da779088642 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1214,7 +1214,6 @@ AC_OUTPUT(
 	backend/utils/Gen_fmgrtab.sh
 	bin/pg_dump/Makefile
 	bin/pg_version/Makefile
-	bin/pgaccess/Makefile
 	bin/pgtclsh/mkMakefile.tcldefs.sh
 	bin/pgtclsh/mkMakefile.tkdefs.sh
 	bin/psql/Makefile