Update for pgaccess 0.98.

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 6aaf00f69b68421b93a7c114a30ac1fe7783778a..0e08317b4c27623536eb1a387f9f70e5b8513831 100644 (file)
--- 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 fd1a89d47c68cf5425ea509f9fb11f135dfe8dd0..c14cc61a04fb20570a03cd1d024a20c84a456991 100644 (file)
--- 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 dff1a13a104c2256983eaaa5b208aeb1c19e07b6..60308b42ecb454ec32cb5f30a3e97392219196dc 100755 (executable)
--- 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 c2920f192702569c6f7f505215b162ddd64f4e58..b15104d706c84d2b96719c90e9275d1288c470a1 100644 (file)
--- 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