Index: tools/driver/Makefile
===================================================================
--- tools/driver/Makefile	(revision 108088)
+++ tools/driver/Makefile	(working copy)
@@ -19,7 +19,7 @@
 
 ifeq ($(HOST_OS),Darwin)
 	LD.Flags += -Wl,-rpath,@loader_path/../lib/
-	LD.Flags += -Wl,-sectcreate -Wl,__TEXT -Wl,__info_plist -Wl,lldb-Info.plist
+	LD.Flags += -Wl,-sectcreate -Wl,__TEXT -Wl,__info_plist -Wl,"$(PROJ_SRC_DIR)/lldb-Info.plist"
 endif
 
 ifeq ($(HOST_OS),Linux)
Index: source/Interpreter/Makefile
===================================================================
--- source/Interpreter/Makefile	(revision 108088)
+++ source/Interpreter/Makefile	(working copy)
@@ -20,5 +20,5 @@
 PYTHON_DIR := $(LLDB_BIN_DIR)
 
 LLDBWrapPython.cpp:
-	swig -c++ -shadow -python -I"$(LLDB_LEVEL)/include" -I./. -outdir "$(LLDB_BIN_DIR)" -o LLDBWrapPython.cpp "$(LLDB_LEVEL)/scripts/lldb.swig"
-	cp embedded_interpreter.py "$(PYTHON_DIR)"
+	swig -c++ -shadow -python -I"$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/include" -I./. -outdir "$(LLDB_BIN_DIR)" -o LLDBWrapPython.cpp "$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/scripts/lldb.swig"
+	cp "$(PROJ_SRC_DIR)/embedded_interpreter.py" "$(PYTHON_DIR)"
Index: source/Makefile
===================================================================
--- source/Makefile	(revision 108088)
+++ source/Makefile	(working copy)
@@ -16,5 +16,5 @@
 
 include $(LLDB_LEVEL)/Makefile
 
-LLDB_vers.c: $(LLDB_LEVEL)/scripts/generate-vers.pl $(LLDB_LEVEL)/lldb.xcodeproj/project.pbxproj
-	$(LLDB_LEVEL)/scripts/generate-vers.pl $(LLDB_LEVEL)/lldb.xcodeproj/project.pbxproj > LLDB_vers.c
+LLDB_vers.c: $(PROJ_SRC_DIR)/$(LLDB_LEVEL)/scripts/generate-vers.pl $(PROJ_SRC_DIR)/$(LLDB_LEVEL)/lldb.xcodeproj/project.pbxproj
+	"$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/scripts/generate-vers.pl" "$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/lldb.xcodeproj/project.pbxproj" > LLDB_vers.c
Index: lib/Makefile
===================================================================
--- lib/Makefile	(revision 108088)
+++ lib/Makefile	(working copy)
@@ -87,7 +87,7 @@
 	LLVMLibsOptions += -F/System/Library/Frameworks -F/System/Library/PrivateFrameworks
 	LLVMLibsOptions += -framework Foundation -framework CoreFoundation 
 	LLVMLibsOptions += -framework DebugSymbols -lpython2.6 -lobjc
-	LLVMLibsOptions += -Wl,-exported_symbols_list -Wl,$(LLDB_LEVEL)/resources/lldb-framework-exports 
+	LLVMLibsOptions += -Wl,-exported_symbols_list -Wl,"$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/resources/lldb-framework-exports" 
     # Mac OS X 10.4 and earlier tools do not allow a second -install_name on command line
     DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/')
     ifneq ($(DARWIN_VERS),8)