Index: source/Interpreter/Makefile
===================================================================
--- source/Interpreter/Makefile	(revision 131702)
+++ source/Interpreter/Makefile	(working copy)
@@ -18,7 +18,13 @@
 LLDB_PYTHON_SWIG_CPP = $(PROJ_OBJ_ROOT)/$(BuildMode)/LLDBWrapPython.cpp
 LLDB_BIN_DIR := $(PROJ_OBJ_ROOT)/$(BuildMode)/bin
 PYTHON_DIR := $(LLDB_BIN_DIR)
+ifeq ($(HOST_OS),Darwin)
+PYTHON_DEST_DIR := /Library/Python/$(shell python -c 'import sys; print sys.version[:3]')/site-packages
+else
+PYTHON_DEST_DIR := $(shell python -c 'import sys; print sys.exec_prefix')/lib/python$(shell python -c 'import sys; pritn sys.version[:3]')/site-packages
+endif
 LLDB_SWIG_INCLUDE_DIRS:= -I"$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/include" -I./.
+LIBLLDB := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/liblldb$(SHLIBEXT)
 
 # We need Swig to process stdint.h, but by default it will not inspect system
 # include directories.  The following should cover the standard locations on
@@ -27,7 +33,16 @@
 LLDB_SWIG_INCLUDE_DIRS += -I"/usr/include"
 
 LLDBWrapPython.cpp:
-	swig -c++ -shadow -python $(LLDB_SWIG_INCLUDE_DIRS) \
+	$(Echo) Generating LLDBWrapPython.cpp
+	$(Verb) swig -c++ -classic -shadow -python $(LLDB_SWIG_INCLUDE_DIRS) \
           -D__STDC_LIMIT_MACROS -outdir "$(LLDB_BIN_DIR)"   \
           -o LLDBWrapPython.cpp "$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/scripts/lldb.swig"
-	cp "$(PROJ_SRC_DIR)/embedded_interpreter.py" "$(PYTHON_DIR)"
+	$(Verb) cp "$(PROJ_SRC_DIR)/embedded_interpreter.py" "$(PYTHON_DIR)"
+
+install-local:: $(PYTHON_DIR)/lldb.py $(PYTHON_DIR)/embedded_interpreter.py $(LIBLLDB)
+	$(Echo) Installing $(BuildMode) LLDB python modules
+	$(Verb) $(MKDIR) $(PYTHON_DEST_DIR)/lib-dynload
+	$(Verb) $(DataInstall) $(PYTHON_DIR)/lldb.py $(PYTHON_DEST_DIR)/lldb.py
+	$(Verb) $(DataInstall) $(PYTHON_DIR)/embedded_interpreter.py $(PYTHON_DEST_DIR)/embedded_interpreter.py
+	$(Verb) $(RM) -f $(PYTHON_DEST_DIR)/lib-dynload/_lldb.so
+	$(Verb) $(AliasTool) $(LIBLLDB) $(PYTHON_DEST_DIR)/lib-dynload/_lldb.so
Index: source/Host/macosx/Host.mm
===================================================================
--- source/Host/macosx/Host.mm	(revision 131702)
+++ source/Host/macosx/Host.mm	(working copy)
@@ -565,7 +565,7 @@
 
 extern "C" {
     const char *__crashreporter_info__ = NULL;
-};
+}
 
 asm(".desc ___crashreporter_info__, 0x10");
 
Index: source/Host/macosx/Makefile
===================================================================
--- source/Host/macosx/Makefile	(revision 131702)
+++ source/Host/macosx/Makefile	(working copy)
@@ -11,6 +11,14 @@
 LIBRARYNAME := lldbHostMacOSX
 BUILD_ARCHIVE = 1
 
-SOURCES := $(notdir $(wildcard *.cpp *.mm))
+SOURCES = $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp $(PROJ_SRC_DIR)/*.mm)) \
+          $(addprefix cfcpp/,$(notdir $(wildcard $(PROJ_SRC_DIR)/cfcpp/*.cpp)))
 
+# Make sure the cfcpp output directory exists
+all-local:: $(PROJ_OBJ_DIR)/$(BuildMode)/cfcpp
+
+$(PROJ_OBJ_DIR)/$(BuildMode)/cfcpp:
+	-$(Verb) $(MKDIR) $(PROJ_OBJ_DIR)/$(BuildMode)/cfcpp 2>/dev/null
+
 include $(LLDB_LEVEL)/Makefile
+
