From: Bruce Momjian <bruce@momjian.us>
Date: Sun, 31 Oct 1999 19:56:37 +0000 (+0000)
Subject: Update for pgaccess 0.98.
X-Git-Url: http://git.postgresql.org/gitweb/static/gitwe%3Cscript%20data-cfasync=?a=commitdiff_plain;h=ef4640aee73ea6b70502ac0aa3bd0add7a9f70b1;p=users%2Fbernd%2Fpostgres.git

Update for pgaccess 0.98.
---

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 6aaf00f69b..0e08317b4c 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -145,6 +145,7 @@ endif
 #
 USE_TCL= @USE_TCL@
 USE_TK= @USE_TK@
+WISH= @WISH@
 
 USE_PERL= @USE_PERL@
 
diff --git a/src/bin/pgaccess/Makefile.in b/src/bin/pgaccess/Makefile
similarity index 85%
rename from src/bin/pgaccess/Makefile.in
rename to src/bin/pgaccess/Makefile
index fd1a89d47c..c14cc61a04 100644
--- a/src/bin/pgaccess/Makefile.in
+++ b/src/bin/pgaccess/Makefile
@@ -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 b/src/configure
index dff1a13a10..60308b42ec 100755
--- a/src/configure
+++ b/src/configure
@@ -7766,7 +7766,6 @@ trap 'rm -fr `echo "GNUmakefile
 	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
@@ -7940,7 +7939,6 @@ CONFIG_FILES=\${CONFIG_FILES-"GNUmakefile
 	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
diff --git a/src/configure.in b/src/configure.in
index c2920f1927..b15104d706 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1187,7 +1187,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