Index: trunk/Chameleon.xcodeproj/project.pbxproj
===================================================================
--- trunk/Chameleon.xcodeproj/project.pbxproj	(revision 1501)
+++ trunk/Chameleon.xcodeproj/project.pbxproj	(revision 1502)
@@ -649,6 +649,7 @@
 		6DBAFFC313B0D4590047ED33 /* ufsmount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ufsmount.h; sourceTree = "<group>"; };
 		6DBAFFC413B0D4590047ED33 /* unistd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unistd.h; sourceTree = "<group>"; };
 		6DBAFFC513B0D4590047ED33 /* unwind.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unwind.h; sourceTree = "<group>"; };
+		A360AA7D14136C1A00084D3F /* Make.rules */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Make.rules; sourceTree = "<group>"; };
 		B0056CE711F3868000754B65 /* boot0.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = boot0.s; sourceTree = "<group>"; };
 		B0056CE811F3868000754B65 /* chain0.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = chain0.s; sourceTree = "<group>"; };
 		B0056CE911F3868000754B65 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
@@ -780,7 +781,6 @@
 		B0056D7411F3868000754B65 /* xml.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xml.c; sourceTree = "<group>"; };
 		B0056D7511F3868000754B65 /* xml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xml.h; sourceTree = "<group>"; };
 		B0056D7611F3868000754B65 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
-		B0056D7811F3868000754B65 /* MakePaths.dir */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MakePaths.dir; sourceTree = "<group>"; };
 		B0056D7A11F3868000754B65 /* machOconv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = machOconv.c; sourceTree = "<group>"; };
 		B0056D7B11F3868000754B65 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
 		B0056D7C11F3868000754B65 /* TODO */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TODO; sourceTree = "<group>"; };
@@ -933,6 +933,7 @@
 				019DFBAF11FB94090013E8CC /* MEMTEST86_LICENSE */,
 				B0056D7C11F3868000754B65 /* TODO */,
 				B0056D7D11F3868000754B65 /* Makefile */,
+				A360AA7D14136C1A00084D3F /* Make.rules */,
 				B0056D8011F3868000754B65 /* coding_standards.txt */,
 			);
 			name = Chameleon;
@@ -2050,7 +2051,6 @@
 				B0056D2411F3868000754B65 /* libsaio */,
 				B0056D7911F3868000754B65 /* util */,
 				B0056D7611F3868000754B65 /* Makefile */,
-				B0056D7811F3868000754B65 /* MakePaths.dir */,
 			);
 			path = i386;
 			sourceTree = "<group>";
Index: trunk/i386/MakePaths.dir
===================================================================
--- trunk/i386/MakePaths.dir	(revision 1501)
+++ trunk/i386/MakePaths.dir	(revision 1502)
@@ -1,9 +0,0 @@
-#
-# Default paths for subdirectories.
-#
-
-OBJROOT=../../obj/i386/$(DIR)
-SYMROOT=../../sym/i386
-DSTROOT=../../dst/i386
-SRCROOT=/tmp
-
Index: trunk/i386/libsaio/Makefile
===================================================================
--- trunk/i386/libsaio/Makefile	(revision 1501)
+++ trunk/i386/libsaio/Makefile	(revision 1502)
@@ -1,4 +1,4 @@
-SRCROOT = $(shell pwd)/../../
+SRCROOT = $(CURDIR)/../../
 OBJROOT = $(SRCROOT)/obj/i386/libsaio
 SYMROOT = $(SRCROOT)/sym/i386
 DSTROOT = $(SRCROOT)/dst/i386
Index: trunk/i386/boot0/Makefile
===================================================================
--- trunk/i386/boot0/Makefile	(revision 1501)
+++ trunk/i386/boot0/Makefile	(revision 1502)
@@ -1,4 +1,4 @@
-SRCROOT = $(shell pwd)/../../
+SRCROOT = $(CURDIR)/../../
 OBJROOT = $(SRCROOT)/obj/i386/boot0
 SYMROOT = $(SRCROOT)/sym/i386
 DSTROOT = $(SRCROOT)/dst/i386
Index: trunk/i386/boot1/Makefile
===================================================================
--- trunk/i386/boot1/Makefile	(revision 1501)
+++ trunk/i386/boot1/Makefile	(revision 1502)
@@ -1,4 +1,4 @@
-SRCROOT = $(shell pwd)/../../
+SRCROOT = $(CURDIR)/../../
 OBJROOT = $(SRCROOT)/obj/i386/boot1
 SYMROOT = $(SRCROOT)/sym/i386
 DSTROOT = $(SRCROOT)/dst/i386
Index: trunk/i386/boot2/Makefile
===================================================================
--- trunk/i386/boot2/Makefile	(revision 1501)
+++ trunk/i386/boot2/Makefile	(revision 1502)
@@ -1,4 +1,4 @@
-SRCROOT = $(shell pwd)/../../
+SRCROOT = $(CURDIR)/../../
 OBJROOT = $(SRCROOT)/obj/i386/boot2
 SYMROOT = $(SRCROOT)/sym/i386
 DSTROOT = $(SRCROOT)/dst/i386
Index: trunk/i386/cdboot/Makefile
===================================================================
--- trunk/i386/cdboot/Makefile	(revision 1501)
+++ trunk/i386/cdboot/Makefile	(revision 1502)
@@ -1,4 +1,4 @@
-SRCROOT = $(shell pwd)/../../
+SRCROOT = $(CURDIR)/../../
 OBJROOT = $(SRCROOT)/obj/i386/cdboot
 SYMROOT = $(SRCROOT)/sym/i386
 DSTROOT = $(SRCROOT)/dst/i386
Index: trunk/i386/libsa/Makefile
===================================================================
--- trunk/i386/libsa/Makefile	(revision 1501)
+++ trunk/i386/libsa/Makefile	(revision 1502)
@@ -1,4 +1,4 @@
-SRCROOT = $(shell pwd)/../../
+SRCROOT = $(CURDIR)/../../
 OBJROOT = $(SRCROOT)/obj/i386/libsa
 SYMROOT = $(SRCROOT)/sym/i386
 DSTROOT = $(SRCROOT)/dst/i386
Index: trunk/i386/Makefile
===================================================================
--- trunk/i386/Makefile	(revision 1501)
+++ trunk/i386/Makefile	(revision 1502)
@@ -3,7 +3,7 @@
 #
 # these paths are only valid in subdirectories of this directory
 #
-SRCROOT = $(shell pwd)/../
+SRCROOT = $(CURDIR)/../
 OBJROOT = $(SRCROOT)/obj/i386
 SYMROOT = $(SRCROOT)/sym/i386
 DSTROOT = $(SRCROOT)/dst/i386
Index: trunk/i386/util/Makefile
===================================================================
--- trunk/i386/util/Makefile	(revision 1501)
+++ trunk/i386/util/Makefile	(revision 1502)
@@ -3,7 +3,7 @@
 # we'll just keep the generated files in this directory
 # and install them directly, rather than generating them again.
 #
-SRCROOT = $(shell pwd)/../../
+SRCROOT = $(CURDIR)/../../
 OBJROOT = $(SRCROOT)/obj/i386/util
 SYMROOT = $(SRCROOT)/sym/i386
 DSTROOT = $(SRCROOT)/dst/i386
Index: trunk/Makefile
===================================================================
--- trunk/Makefile	(revision 1501)
+++ trunk/Makefile	(revision 1502)
@@ -1,5 +1,5 @@
 #	Makefile for kernel booter
-SRCROOT = $(shell pwd)
+SRCROOT = $(CURDIR)
 OBJROOT = $(SRCROOT)/obj
 SYMROOT = $(SRCROOT)/sym
 DSTROOT = $(SRCROOT)/dst