diff options
| author | Bruce Momjian | 1998-12-18 17:53:46 +0000 |
|---|---|---|
| committer | Bruce Momjian | 1998-12-18 17:53:46 +0000 |
| commit | 47af45c631aa1059e2f4a6cbb4335f390c751a61 (patch) | |
| tree | 8dbc230376226a1e258c4d297cef03929b1c8356 | |
| parent | 6c2000944982e82fc879129bd9bfddad4a87c5f4 (diff) | |
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
| -rw-r--r-- | src/bin/Makefile | 5 | ||||
| -rw-r--r-- | src/interfaces/Makefile | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/bin/Makefile b/src/bin/Makefile index 56cec86817a..0b231ecf196 100644 --- a/src/bin/Makefile +++ b/src/bin/Makefile @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.15 1998/07/26 04:31:08 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.15.2.1 1998/12/18 17:53:45 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 65a2f51b6fb..420f8b7b643 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.20.2.1 1998/12/18 17:53:46 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 \ |