Skip to content

Commit 47af45c

Browse files
committed
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
1 parent 6c20009 commit 47af45c

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/bin/Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.15 1998/07/26 04:31:08 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.15.2.1 1998/12/18 17:53:45 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -25,6 +25,9 @@ endif
2525
# TCL/TK programs
2626
#
2727
ifeq ($(USE_TCL), true)
28+
ifeq ($(USE_TK), true)
29+
DIRS += pgaccess
30+
endif
2831
DIRS += pgtclsh
2932
endif
3033

src/interfaces/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.20 1998/10/27 21:27:36 tgl Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.20.2.1 1998/12/18 17:53:46 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -48,11 +48,11 @@ endif
4848
perl5/Makefile: perl5/Makefile.PL
4949
cd perl5 && perl Makefile.PL
5050

51-
install-perl5:
51+
install-perl5: perl5/Makefile
5252
$(MAKE) -C perl5 clean
5353
cd perl5 && POSTGRES_HOME="$(POSTGRESDIR)" perl Makefile.PL
5454
$(MAKE) -C perl5 all
55-
if [ -w `sed -n -e 's/^ *SITELIBEXP *= *//p' perl5/Makefile` ]; then \
55+
@if [ -w `sed -n -e 's/^ *SITELIBEXP *= *//p' perl5/Makefile` ]; then \
5656
$(MAKE) $(MFLAGS) -C perl5 install; \
5757
rm -f perl5/Makefile; \
5858
else \

0 commit comments

Comments
 (0)