6 files changed, 11 insertions, 8 deletions
diff --git a/clang/tools/scan-view/CMakeLists.txt b/clang/tools/scan-view/CMakeLists.txt
index 5e8eff279d2..969d519d8a2 100644
--- a/clang/tools/scan-view/CMakeLists.txt
+++ b/clang/tools/scan-view/CMakeLists.txt
@@ -1,12 +1,12 @@
 option(CLANG_INSTALL_SCANVIEW "Install the scan-view tool" ON)
 
 set(BinFiles
-      Reporter.py
-      ScanView.py
-      scan-view
-      startfile.py)
+      scan-view)
 
 set(ShareFiles
+      ScanView.py
+      Reporter.py
+      startfile.py
       FileRadar.scpt
       GetRadarVersion.scpt
       bugcatcher.ico)
diff --git a/clang/tools/scan-view/Makefile b/clang/tools/scan-view/Makefile
index 2d4380cac3d..e980b382178 100644
--- a/clang/tools/scan-view/Makefile
+++ b/clang/tools/scan-view/Makefile
@@ -15,10 +15,10 @@ include $(CLANG_LEVEL)/Makefile
 CLANG_INSTALL_SCANVIEW ?= 1
 
 ifeq ($(CLANG_INSTALL_SCANVIEW), 1)
-  InstallTargets := $(ToolDir)/Reporter.py \
-                    $(ToolDir)/ScanView.py \
-                    $(ToolDir)/scan-view \
-                    $(ToolDir)/startfile.py \
+  InstallTargets := $(ToolDir)/scan-view \
+                    $(ShareDir)/scan-view/Reporter.py \
+                    $(ShareDir)/scan-view/ScanView.py \
+                    $(ShareDir)/scan-view/startfile.py \
                     $(ShareDir)/scan-view/FileRadar.scpt \
                     $(ShareDir)/scan-view/GetRadarVersion.scpt \
                     $(ShareDir)/scan-view/bugcatcher.ico
diff --git a/clang/tools/scan-view/scan-view b/clang/tools/scan-view/scan-view
index fb27da69888..797db637ae3 100755
--- a/clang/tools/scan-view/scan-view
+++ b/clang/tools/scan-view/scan-view
@@ -4,6 +4,8 @@
 """
 
 import sys
+import imp
+import os
 import posixpath
 import thread
 import time
@@ -54,6 +56,7 @@ def start_browser(port, options):
     webbrowser.open(url)
 
 def run(port, options, root):
+    sys.path.append(os.path.dirname(__file__) + "/../share/scan-view")
     import ScanView
     try:
         print 'Starting scan-view at: http://%s:%d'%(options.host,
diff --git a/clang/tools/scan-view/Reporter.py b/clang/tools/scan-view/share/Reporter.py
index 294e05b44c2..294e05b44c2 100644
--- a/clang/tools/scan-view/Reporter.py
+++ b/clang/tools/scan-view/share/Reporter.py
diff --git a/clang/tools/scan-view/ScanView.py b/clang/tools/scan-view/share/ScanView.py
index 7dc0351ebe7..7dc0351ebe7 100644
--- a/clang/tools/scan-view/ScanView.py
+++ b/clang/tools/scan-view/share/ScanView.py
diff --git a/clang/tools/scan-view/startfile.py b/clang/tools/scan-view/share/startfile.py
index e8fbe2d5a84..e8fbe2d5a84 100644
--- a/clang/tools/scan-view/startfile.py
+++ b/clang/tools/scan-view/share/startfile.py