$NetBSD: patch-aa,v 1.3 1999/09/20 23:38:48 jlam Exp $

--- ./Makefile.global.in.orig	Fri Jul 30 00:13:44 1999
+++ ./Makefile.global.in	Mon Sep 20 00:49:27 1999
@@ -54,6 +54,15 @@
 ELF_SYSTEM= @ELF_SYS@
 
 LIBPQDIR:= $(SRCDIR)/interfaces/libpq
+LIBPGTCLDIR:= $(SRCDIR)/interfaces/libpgtcl
+
+ifneq ($(LIBTOOL),)
+LIBPQ:= $(LIBPQDIR)/libpq.la
+LIBPGTCL:= $(LIBPGTCLDIR)/libpgtcl.la
+else
+LIBPQ:= -L$(LIBPQDIR) -lpq
+LIBPGTCL:= -L$(LIBPGTCLDIR) -lpgtcl
+endif
 
 # For convenience, POSTGRESDIR is where BINDIR, and LIBDIR
 # and other target destinations are rooted.  Of course, each of these is
@@ -200,6 +209,7 @@
 #-------------------------------------------------------------
 CC= @CC@
 CPP= @CPP@
+CXX= @CXX@
 YFLAGS= @YFLAGS@
 YACC= @YACC@
 LEX= @LEX@
@@ -243,7 +253,7 @@
 ##############################################################################
 
 ifneq ($(CUSTOM_INSTALL),)
-INSTALL= $(CUSTOM_INSTALL)
+INSTALL:= $(CUSTOM_INSTALL)
 endif
 
 #
@@ -274,7 +284,11 @@
 # using a i486 or better.
 
 ifneq ($(CUSTOM_CC),)
-  CC= $(CUSTOM_CC)
+  CC:= $(CUSTOM_CC)
+endif
+
+ifneq ($(CUSTOM_CXX),)
+  CXX:= $(CUSTOM_CXX)
 endif
 
 ifneq ($(CUSTOM_COPT),)
