From 9dab728700556a8ed05bf726fad802cedca3f058 Mon Sep 17 00:00:00 2001
From: Bruce Momjian
Date: Sun, 31 Oct 1999 19:50:48 +0000
Subject: Update to pgaccess 0.98.

---
 src/Makefile.global.in       |  3 ++-
 src/bin/pgaccess/Makefile    | 37 +++++++++++++++++++++++++++++++++++++
 src/bin/pgaccess/Makefile.in | 35 -----------------------------------
 src/configure.in             |  1 -
 4 files changed, 39 insertions(+), 37 deletions(-)
 create mode 100644 src/bin/pgaccess/Makefile
 delete mode 100644 src/bin/pgaccess/Makefile.in

(limited to 'src')

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 472e2802b5d..98d4156ea75 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 b/src/bin/pgaccess/Makefile
new file mode 100644
index 00000000000..525c3934063
--- /dev/null
+++ b/src/bin/pgaccess/Makefile
@@ -0,0 +1,37 @@
+#-------------------------------------------------------------------------
+#
+# Makefile
+#    Makefile for pgaccess
+#
+# Copyright (c) 1994, Regents of the University of California
+#
+# IDENTIFICATION
+#    $Header: /cvsroot/pgsql/src/bin/pgaccess/Attic/Makefile,v 1.7 1999/10/31 19:50:47 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
+	@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/bin/pgaccess/Makefile.in b/src/bin/pgaccess/Makefile.in
deleted file mode 100644
index 658602d9378..00000000000
--- a/src/bin/pgaccess/Makefile.in
+++ /dev/null
@@ -1,35 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# 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 1999/10/31 12:23:41 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/configure.in b/src/configure.in
index de38c95e40a..b4f2d754279 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
-- 
cgit v1.2.3