From 3d39ea7341bfa1cae5baf9956cb1692c2d267e9d Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Fri, 18 Dec 1998 17:53:22 +0000 Subject: [PATCH] Here are descriptions: - the first patch is just to preven listing the perl warning in the make output unless it is actually emitted by the make. this may prevent new users from being confused by the warning in their output - the second patch (to 2 files) just enables building/installing pgaccess if TCL and TK are available. a Makefile is created to do this, but you may wish to change the heading information in it since I just copied another Makefile to use as a template. I hope these make it into 6.4.1. Cheers, Brook --- src/bin/Makefile | 5 ++++- src/interfaces/Makefile | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/bin/Makefile b/src/bin/Makefile index 585c0aaf56..e8fad4374d 100644 --- a/src/bin/Makefile +++ b/src/bin/Makefile @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.16 1998/11/14 01:56:36 thomas Exp $ +# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.17 1998/12/18 17:53:21 momjian Exp $ # #------------------------------------------------------------------------- @@ -25,6 +25,9 @@ endif # TCL/TK programs # ifeq ($(USE_TCL), true) +ifeq ($(USE_TK), true) + DIRS += pgaccess +endif DIRS += pgtclsh endif diff --git a/src/interfaces/Makefile b/src/interfaces/Makefile index 65a2f51b6f..eab67ffbe4 100644 --- a/src/interfaces/Makefile +++ b/src/interfaces/Makefile @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.20 1998/10/27 21:27:36 tgl Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.21 1998/12/18 17:53:22 momjian Exp $ # #------------------------------------------------------------------------- @@ -48,11 +48,11 @@ endif perl5/Makefile: perl5/Makefile.PL cd perl5 && perl Makefile.PL -install-perl5: +install-perl5: perl5/Makefile $(MAKE) -C perl5 clean cd perl5 && POSTGRES_HOME="$(POSTGRESDIR)" perl Makefile.PL $(MAKE) -C perl5 all - if [ -w `sed -n -e 's/^ *SITELIBEXP *= *//p' perl5/Makefile` ]; then \ + @if [ -w `sed -n -e 's/^ *SITELIBEXP *= *//p' perl5/Makefile` ]; then \ $(MAKE) $(MFLAGS) -C perl5 install; \ rm -f perl5/Makefile; \ else \