diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.global.in | 3 | ||||
| -rw-r--r-- | src/bin/pgaccess/Makefile (renamed from src/bin/pgaccess/Makefile.in) | 6 | ||||
| -rwxr-xr-x | src/configure | 2 | ||||
| -rw-r--r-- | src/configure.in | 1 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 3fd046cedf4..c9622a1d600 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.56.2.1 1999/07/30 04:13:44 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.56.2.2 1999/10/31 19:56:33 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@ diff --git a/src/bin/pgaccess/Makefile.in b/src/bin/pgaccess/Makefile index 3a8b3ad964f..a147806f40f 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.2.1 1999/10/31 12:34:10 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/pgaccess/Attic/Makefile,v 1.1.4.5 1999/10/31 19:56:37 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 b/src/configure index dff1a13a104..60308b42ecb 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 c2920f19270..b15104d706c 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 |