diff --git a/src/backend/access/Makefile b/src/backend/access/Makefile
index a098d3d275e9dbae55a05ee932f62bcff1903715..ceedd8da84982c46b4d5cd1b8e1a3e843b480a04 100644
--- a/src/backend/access/Makefile
+++ b/src/backend/access/Makefile
@@ -4,10 +4,13 @@
 #    Makefile for the access methods module
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/access/Makefile,v 1.2 1996/11/10 03:11:46 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/backend/access/Makefile,v 1.3 1997/06/11 01:11:30 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
+SRCDIR = ../..
+include ../../Makefile.global
+
 OBJS = common/SUBSYS.o gist/SUBSYS.o hash/SUBSYS.o heap/SUBSYS.o \
        index/SUBSYS.o rtree/SUBSYS.o nbtree/SUBSYS.o transam/SUBSYS.o
 
diff --git a/src/backend/bootstrap/Makefile b/src/backend/bootstrap/Makefile
index 30c77bb53f33f5df2ec9380614a71695445aea25..81abfb749a472ee496f8b5b17987f086f328e89f 100644
--- a/src/backend/bootstrap/Makefile
+++ b/src/backend/bootstrap/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for the bootstrap module
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.9 1997/06/11 01:05:48 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.10 1997/06/11 01:11:55 scrappy Exp $
 #
 #
 # We must build bootparse.c and bootscanner.c with yacc and lex and sed,
@@ -38,7 +38,7 @@ OBJS= bootparse.o bootscanner.o bootstrap.o
 all: SUBSYS.o
 
 SUBSYS.o: $(OBJS)
-	ld -r -o SUBSYS.o $(OBJS)
+	$(LD) -r -o SUBSYS.o $(OBJS)
 
 # bootstrap.o's dependency on bootstrap_tokens.h is computed by the
 # make depend, but we state it here explicitly anyway because 
diff --git a/src/backend/libpq/pqcomprim.c b/src/backend/libpq/pqcomprim.c
index 00177da4416eccdb8034ec887a5753ab02df858f..2756285b176ebf4c7fce95d29808c3c2186957a4 100644
--- a/src/backend/libpq/pqcomprim.c
+++ b/src/backend/libpq/pqcomprim.c
@@ -32,9 +32,9 @@
 #    define hton_l(n) (ntoh_l(n))
 #  else	/* BYTE_ORDER != BIG_ENDIAN */
 #    if BYTE_ORDER == PDP_ENDIAN
-#      #error PDP_ENDIAN macros not written yet
+#      error PDP_ENDIAN macros not written yet
 #    else	/* BYTE_ORDER !=  anything known */
-#      #error BYTE_ORDER not defined as anything understood
+#      error BYTE_ORDER not defined as anything understood
 #    endif	/* BYTE_ORDER == PDP_ENDIAN */
 #  endif	/* BYTE_ORDER == BIG_ENDIAN */
 #endif		/* BYTE_ORDER == LITTLE_ENDIAN */
diff --git a/src/backend/optimizer/Makefile b/src/backend/optimizer/Makefile
index 92d9ebf8a4fd40f6a4fc88e17bb1412c0e03f355..40c92028d9d82b7e0855d88d8197666e50b64119 100644
--- a/src/backend/optimizer/Makefile
+++ b/src/backend/optimizer/Makefile
@@ -4,10 +4,13 @@
 #    Makefile for optimizer
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/optimizer/Makefile,v 1.3 1997/02/19 12:56:31 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/optimizer/Makefile,v 1.4 1997/06/11 01:12:55 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
+SRCDIR= ../..
+include ../../Makefile.global
+
 all: submake SUBSYS.o
 
 OBJS = path/SUBSYS.o plan/SUBSYS.o prep/SUBSYS.o util/SUBSYS.o geqo/SUBSYS.o
diff --git a/src/backend/storage/Makefile b/src/backend/storage/Makefile
index dcab1e36d2de79982812e89367267f2b442295c1..1fb7883251d1451ffcad08568ce6df69102b982e 100644
--- a/src/backend/storage/Makefile
+++ b/src/backend/storage/Makefile
@@ -4,10 +4,13 @@
 #    Makefile for the storage manager subsystem
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/storage/Makefile,v 1.2 1996/11/10 03:13:59 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/backend/storage/Makefile,v 1.3 1997/06/11 01:13:10 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
+SRCDIR= ../..
+include ../../Makefile.global
+
 all: submake SUBSYS.o
 
 OBJS = buffer/SUBSYS.o file/SUBSYS.o ipc/SUBSYS.o large_object/SUBSYS.o \