Update for 0.98 pgaccess

5 files changed, 47 insertions, 32 deletions

diff --git a/src/bin/pgaccess/Makefile b/src/bin/pgaccess/Makefile
deleted file mode 100644
index ff62a5623f2..00000000000
--- 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.1.4.3 1999/10/30 21:22:07 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 00000000000..3a8b3ad964f
--- /dev/null
+++ b/src/bin/pgaccess/Makefile.in
@@ -0,0 +1,35 @@
+#-------------------------------------------------------------------------
+#
+# 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.2.2.1 1999/10/31 12:34:10 momjian Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR= ../..
+include $(SRCDIR)/Makefile.global
+
+all: pgaccess
+
+pgaccess: pgaccess.sh
+	sed -e 's;__wish__;@wish@;' pgaccess.sh |	\
+	sed -e 's;__POSTGRESDIR__;$(POSTGRESDIR);' 	\
+			> pgaccess
+
+install:
+	$(INSTALL) $(INSTL_EXE_OPTS) pgaccess $(BINDIR)/pgaccess
+	@if [ ! -d $(POSTGRESDIR)/pgaccess ]; then mkdir $(POSTGRESDIR)/pgaccess; fi
+	$(INSTALL) $(INSTL_EXE_OPTS) main.tcl $(POSTGRESDIR)/pgaccess
+	@if [ ! -d $(POSTGRESDIR)/pgaccess/lib ]; then mkdir $(POSTGRESDIR)/pgaccess/lib; fi
+	$(INSTALL) $(INSTLOPTS) lib/*.tcl $(POSTGRESDIR)/pgaccess/lib
+	@if [ ! -d $(POSTGRESDIR)/pgaccess/lib/help ]; then mkdir $(POSTGRESDIR)/pgaccess/lib/help; fi
+	$(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
+
+clean:
+	rm -f pgaccess
diff --git a/src/bin/pgaccess/pgaccess b/src/bin/pgaccess/pgaccess
deleted file mode 100755
index 41fd5cae16f..00000000000
--- 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 00000000000..b030e18f456
--- /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 4db172b82d9..c2920f19270 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1093,6 +1093,7 @@ then
 	else
 		AC_MSG_RESULT($TK_CONFIG_SH)
 		AC_SUBST(TK_CONFIG_SH)
+		AC_PATH_PROG(wish, wish)
 	fi
 fi
 
@@ -1186,9 +1187,10 @@ AC_OUTPUT(
 	backend/utils/Gen_fmgrtab.sh
 	bin/pg_dump/Makefile
 	bin/pg_version/Makefile
-	bin/psql/Makefile
+	bin/pgaccess/Makefile
 	bin/pgtclsh/mkMakefile.tcldefs.sh
 	bin/pgtclsh/mkMakefile.tkdefs.sh
+	bin/psql/Makefile
 	include/version.h
 	interfaces/libpq/Makefile
 	interfaces/ecpg/lib/Makefile