aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bin/pgaccess/Makefile.in18
-rwxr-xr-xsrc/bin/pgaccess/pgaccess.sh4
2 files changed, 13 insertions, 9 deletions
diff --git a/src/bin/pgaccess/Makefile.in b/src/bin/pgaccess/Makefile.in
index fdce4b50bf4..658602d9378 100644
--- a/src/bin/pgaccess/Makefile.in
+++ b/src/bin/pgaccess/Makefile.in
@@ -6,7 +6,7 @@
# Copyright (c) 1994, Regents of the University of California
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/pgaccess/Attic/Makefile.in,v 1.1 1999/10/31 11:50:03 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/pgaccess/Attic/Makefile.in,v 1.2 1999/10/31 12:23:41 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -16,16 +16,20 @@ include $(SRCDIR)/Makefile.global
all: pgaccess
pgaccess: pgaccess.sh
- sed -e 's/__wish__/@wish@/' \
- sed -e 's/__POSTGRESDIR__/$(POSTGRESDIR)/' \
- pgaccess.sh > pgaccess
+ 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
- $(INSTALL) $(INSTL_EXE_OPTS) lib/* $(POSTGRESDIR)/pgaccess/lib
-# $(INSTALL) $(INSTL_EXE_OPTS) lib/help/* $(POSTGRESDIR)/pgaccess/lib/help
-# $(INSTALL) $(INSTL_EXE_OPTS) lib/languages/* $(POSTGRESDIR)/pgaccess/lib/languages
+ @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.sh b/src/bin/pgaccess/pgaccess.sh
index 0e5ced0705a..b030e18f456 100755
--- a/src/bin/pgaccess/pgaccess.sh
+++ b/src/bin/pgaccess/pgaccess.sh
@@ -1,9 +1,9 @@
#!/bin/sh
-PATH_TO_WISH= __wish__
+PATH_TO_WISH=__wish__
PGACCESS_HOME=__POSTGRESDIR__/pgaccess
export PATH_TO_WISH
export PGACCESS_HOME
-exec $(PATH_TO_WISH) $(PGACCESS_HOME)/main.tcl "$@"
+exec $PATH_TO_WISH $PGACCESS_HOME/main.tcl "$@"