diff --git a/src/interfaces/Makefile b/src/interfaces/Makefile
index f3e52d7ca99..e128f455ec1 100644
--- a/src/interfaces/Makefile
+++ b/src/interfaces/Makefile
@@ -7,19 +7,20 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.1 1997/08/16 20:56:28 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.2 1997/09/16 18:47:16 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
-#include ../Makefile.global
+SRCDIR= ..
+include $(SRCDIR)/Makefile.global
 
 .DEFAULT all:
 	$(MAKE) -C libpq $@
-
 ifeq ($(HAVE_Cplusplus), true)
 	$(MAKE) -C libpq++ $@
+else
+	echo $(HAVE_Cplusplus): No C++
 endif
-
 ifeq ($(USE_TCL), true)
 	$(MAKE) -C libpgtcl $@
 endif
diff --git a/src/interfaces/libpgtcl/Makefile b/src/interfaces/libpgtcl/Makefile
index 11b6375ec46..8ab9930ff29 100644
--- a/src/interfaces/libpgtcl/Makefile
+++ b/src/interfaces/libpgtcl/Makefile
@@ -7,16 +7,16 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.13 1997/09/14 23:34:13 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.14 1997/09/16 18:47:19 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR= ../..
-include ../../Makefile.global
+:nclude $(SRCDIR)/Makefile.global
 
 INCLUDE_OPT= \
-             -I../../backend \
-             -I../../include \
+             -I$(SRCDIR)/backend \
+             -I$(SRCDIR)/include \
              -I$(LIBPQDIR) \
              -I$(TCL_INCDIR)
 
diff --git a/src/interfaces/libpq++/Makefile b/src/interfaces/libpq++/Makefile
index dc4f73e0500..e1de2b16c4e 100644
--- a/src/interfaces/libpq++/Makefile
+++ b/src/interfaces/libpq++/Makefile
@@ -7,13 +7,13 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.8 1997/04/04 10:42:43 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.9 1997/09/16 18:47:23 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR= ..
-include ../Makefile.global
-SRCHEADERDIR = ../include
+SRCDIR= ../..
+include $(SRCDIR)/Makefile.global
+SRCHEADERDIR = $(SRCDIR)/include
 LIBPQHEADERDIR = $(SRCHEADERDIR)/libpq
 
 LIBNAME= libpq++
@@ -25,7 +25,7 @@ LIBNAME= libpq++
 CXXFLAGS= $(CFLAGS) -Wno-error
 
 INCLUDE_OPT= \
-             -I../backend \
+             -I$(SRCDIR)/backend \
              -I$(SRCHEADERDIR) \
              -I$(LIBPQDIR)
 
diff --git a/src/interfaces/libpq++/examples/Makefile b/src/interfaces/libpq++/examples/Makefile
index b847cf27110..aff2fdd9bc9 100644
--- a/src/interfaces/libpq++/examples/Makefile
+++ b/src/interfaces/libpq++/examples/Makefile
@@ -2,8 +2,8 @@
 # Makefile for example programs
 #
 
-SRCDIR= ../..
-include ../../Makefile.global
+SRCDIR= ../../..
+include ../../../Makefile.global
 
 LIBNAME= libpq++
 
@@ -15,8 +15,8 @@ CXXFLAGS= $(CFLAGS) -Wno-error
 
 INCLUDE_OPT= \
              -I.. \
-             -I../../backend \
-             -I../../include \
+             -I../../../backend \
+             -I../../../include \
              -I$(LIBPQDIR) \
              -I$(HEADERDIR)
 CXXFLAGS+= $(INCLUDE_OPT)
diff --git a/src/interfaces/libpq++/man/Makefile b/src/interfaces/libpq++/man/Makefile
index daafc6cd4ec..fd4ce5559fc 100644
--- a/src/interfaces/libpq++/man/Makefile
+++ b/src/interfaces/libpq++/man/Makefile
@@ -4,12 +4,12 @@
 #    Makefile for doc directory to install man pages
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq++/man/Attic/Makefile,v 1.2 1997/01/08 07:32:58 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq++/man/Attic/Makefile,v 1.3 1997/09/16 18:47:36 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR= ../..
-include ../../Makefile.global
+SRCDIR= ../../..
+include ../../../Makefile.global
 
 install: 
 	-mkdir -p $(POSTMANDIR)