aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.global.in3
-rw-r--r--src/bin/pgaccess/Makefile (renamed from src/bin/pgaccess/Makefile.in)6
-rw-r--r--src/configure.in1
3 files changed, 6 insertions, 4 deletions
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.in b/src/bin/pgaccess/Makefile
index 658602d9378..525c3934063 100644
--- a/src/bin/pgaccess/Makefile.in
+++ b/src/bin/pgaccess/Makefile
@@ -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.2 1999/10/31 12:23:41 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/pgaccess/Attic/Makefile,v 1.7 1999/10/31 19:50:47 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -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.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