diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2000-09-25 22:23:01 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2000-09-25 22:23:01 +0000 |
| commit | f428d053ce075bafe1785d0ba7792f4eb92d93d5 (patch) | |
| tree | 5a7e6981c0929343338ca0fa3de0f4e3e4702af1 /src/bin/pgaccess | |
| parent | e353e73768e54c7e5cfd5a1d6e97e1f6315207bb (diff) | |
| download | postgresql-f428d053ce075bafe1785d0ba7792f4eb92d93d5.tar.gz | |
Revise Tcl/Tk configuration. Make missing Tcl after --with-tcl an error,
add --without-tk option to disable Tk. We don't need the AC_PATH_XTRA
test because tkConfig.sh already contains all the information about how to
compile and link with X. Also make sure that libpq is up to date for
libpgtcl. Remove executable bits from pgaccess.sh, but add it to pgaccess.
Diffstat (limited to 'src/bin/pgaccess')
| -rw-r--r-- | src/bin/pgaccess/Makefile | 9 | ||||
| -rwxr-xr-x | src/bin/pgaccess/pgaccess.sh | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/bin/pgaccess/Makefile b/src/bin/pgaccess/Makefile index 359f98f4e5..8360973208 100644 --- a/src/bin/pgaccess/Makefile +++ b/src/bin/pgaccess/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/bin/pgaccess/Attic/Makefile,v 1.12 2000/09/17 13:02:41 petere Exp $ +# $Header: /cvsroot/pgsql/src/bin/pgaccess/Attic/Makefile,v 1.13 2000/09/25 22:22:56 petere Exp $ # #------------------------------------------------------------------------- @@ -16,8 +16,11 @@ pgaccessdir = $(datadir)/pgaccess all: pgaccess -pgaccess: pgaccess.sh - sed -e 's,__wish__,$(WISH),' -e 's,__PGACCESSHOME__,$(pgaccessdir),' < $< > $@ +pgaccess: pgaccess.sh $(top_builddir)/src/Makefile.global + sed -e 's,@WISH@,$(WISH),g' \ + -e 's,@PGACCESSHOME@,$(pgaccessdir),g' \ + $< >$@ + chmod a+x $@ install: all installdirs $(INSTALL_SCRIPT) pgaccess $(DESTDIR)$(bindir)/pgaccess diff --git a/src/bin/pgaccess/pgaccess.sh b/src/bin/pgaccess/pgaccess.sh index c41cf53cce..196873b804 100755 --- a/src/bin/pgaccess/pgaccess.sh +++ b/src/bin/pgaccess/pgaccess.sh @@ -1,9 +1,9 @@ #! /bin/sh -PATH_TO_WISH=__wish__ -PGACCESS_HOME=__PGACCESSHOME__ +PATH_TO_WISH='@WISH@' +PGACCESS_HOME='@PGACCESSHOME@' export PATH_TO_WISH export PGACCESS_HOME -exec ${PATH_TO_WISH} ${PGACCESS_HOME}/main.tcl "$@" +exec "${PATH_TO_WISH}" "${PGACCESS_HOME}/main.tcl" "$@" |