diff --git a/src/Makefile b/src/Makefile
index 6b9ea3f956..548af888db 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Makefile,v 1.7 1996/10/07 23:53:47 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/Makefile,v 1.8 1996/10/19 06:33:52 scrappy Exp $
 #
 # NOTES
 #	objdir	- location of the objects and generated files (eg. obj)
@@ -28,6 +28,9 @@ XARGS = xargs
 .DEFAULT all:
 	$(MAKE) -C backend $@
 	$(MAKE) -C libpq $@
+ifeq ($(HAVE_Cplusplus), true)
+	$(MAKE) -C libpq++ $@
+endif
 ifeq ($(USE_TCL), true)
 	$(MAKE) -C libpgtcl $@
 endif
diff --git a/src/Makefile.global b/src/Makefile.global
index 17b5245440..1b13f7076a 100644
--- a/src/Makefile.global
+++ b/src/Makefile.global
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.39 1996/10/13 13:46:20 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.40 1996/10/19 06:33:55 scrappy Exp $
 #
 # NOTES
 #    This is seen by any Makefiles that include mk/postgres.mk. To
@@ -130,6 +130,8 @@ CFLAGS+= -DNAMEDATALEN=$(NAMEDATALEN) -DOIDNAMELEN=$(OIDNAMELEN)
 # To disable a feature, comment out the entire definition
 # (that is, prepend '#', don't set it to "0" or "no").
 
+HAVE_Cplusplus= false
+
 # Comment out CDEBUG to turn off debugging and sanity-checking.
 #
 #	XXX on MIPS, use -g3 if you want to compile with -O
@@ -152,7 +154,7 @@ ENFORCE_ALIGNMENT= true
 #    and READLINE_LIBDIR to reflect the location of the readline and history
 #    headers and libraries.
 #
-USE_READLINE= true
+USE_READLINE= false
 
 # directories for the readline and history libraries.
 READLINE_INC=  -I/home/tools/include