--- src/interfaces/libpq++/Makefile.in.orig Thu Jul 8 00:10:39 1999
+++ src/interfaces/libpq++/Makefile.in Thu Jul 8 10:26:12 1999
@@ -27,9 +27,7 @@
# because of our inclusion of c.h and we don't know how to stop that.

ifeq ($(CXX), g++)
-CXXFLAGS= -Wno-error
-else
-CXXFLAGS=
+CXXFLAGS+= -Wno-error
endif

CXXFLAGS+= -I$(SRCDIR)/backend \
@@ -52,10 +50,6 @@

# Shared library stuff, also default 'all' target
include $(SRCDIR)/Makefile.shlib
-
-
-# Pull shared-lib CFLAGS into CXXFLAGS
-CXXFLAGS+= $(CFLAGS)


.PHONY: examples
--- src/template/generic.orig Sat Jul 10 02:09:44 1999
+++ src/template/generic Sat Jul 10 09:50:54 1999
@@ -1,10 +1,7 @@
AROPT:crs
-CFLAGS:
-SHARED_LIB:
ALL:
SRCH_INC:
SRCH_LIB:
USE_LOCALE:no
-DLSUFFIX:.so
YFLAGS:-d
YACC:
--- src/pl/tcl/mkMakefile.tcldefs.sh.in.orig Sat Jul 10 14:09:52 1999
+++ src/pl/tcl/mkMakefile.tcldefs.sh.in Sat Jul 10 14:15:50 1999
@@ -6,11 +6,11 @@
exit 1
fi

+# Strip outer quotes from variable and expand ${VAR} to $(VAR) for
+# interpretation by make
cat @TCL_CONFIG_SH@ |
egrep '^TCL_|^TK_' |
- while read inp
- do
- eval eval echo $inp
- done >Makefile.tcldefs
+ sed -e "s/^\([^=]*\)='\(.*\)'$/\1=\2/g" \
+ -e 's/\${\([^}][^}]*\)}/$(\1)/g' >Makefile.tcldefs

exit 0