12 files changed, 17 insertions, 16 deletions
diff --git a/clang/tools/scan-build/CMakeLists.txt b/clang/tools/scan-build/CMakeLists.txt
index 95ab5f73b58..ec7b8ad0ae3 100644
--- a/clang/tools/scan-build/CMakeLists.txt
+++ b/clang/tools/scan-build/CMakeLists.txt
@@ -32,11 +32,11 @@ if(CLANG_INSTALL_SCANBUILD)
                        COMMAND ${CMAKE_COMMAND} -E make_directory
                          ${CMAKE_BINARY_DIR}/bin
                        COMMAND ${CMAKE_COMMAND} -E copy
-                         ${CMAKE_CURRENT_SOURCE_DIR}/${BinFile}
+                         ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}
                          ${CMAKE_BINARY_DIR}/bin/
-                       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${BinFile})
+                       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})
     list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile})
-    install(PROGRAMS ${BinFile} DESTINATION bin)
+    install(PROGRAMS bin/${BinFile} DESTINATION bin)
   endforeach()
 
   foreach(LibexecFile ${LibexecFiles})
@@ -44,11 +44,11 @@ if(CLANG_INSTALL_SCANBUILD)
                        COMMAND ${CMAKE_COMMAND} -E make_directory
                          ${CMAKE_BINARY_DIR}/libexec
                        COMMAND ${CMAKE_COMMAND} -E copy
-                         ${CMAKE_CURRENT_SOURCE_DIR}/${LibexecFile}
+                         ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile}
                          ${CMAKE_BINARY_DIR}/libexec/
-                       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${LibexecFile})
+                       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile})
     list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${LibexecFile})
-    install(PROGRAMS ${LibexecFile} DESTINATION libexec)
+    install(PROGRAMS libexec/${LibexecFile} DESTINATION libexec)
   endforeach()
 
   foreach(ManPage ${ManPages})
@@ -56,11 +56,11 @@ if(CLANG_INSTALL_SCANBUILD)
                        COMMAND ${CMAKE_COMMAND} -E make_directory
                          ${CMAKE_BINARY_DIR}/share/man/man1
                        COMMAND ${CMAKE_COMMAND} -E copy
-                         ${CMAKE_CURRENT_SOURCE_DIR}/${ManPage}
+                         ${CMAKE_CURRENT_SOURCE_DIR}/man/${ManPage}
                          ${CMAKE_BINARY_DIR}/share/man/man1/
-                       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${ManPage})
+                       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/man/${ManPage})
     list(APPEND Depends ${CMAKE_BINARY_DIR}/share/man/man1/${ManPage})
-    install(PROGRAMS ${ManPage} DESTINATION share/man/man1)
+    install(PROGRAMS man/${ManPage} DESTINATION share/man/man1)
   endforeach()
 
   foreach(ShareFile ${ShareFiles})
@@ -68,11 +68,11 @@ if(CLANG_INSTALL_SCANBUILD)
                        COMMAND ${CMAKE_COMMAND} -E make_directory
                          ${CMAKE_BINARY_DIR}/share/scan-build
                        COMMAND ${CMAKE_COMMAND} -E copy
-                         ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}
+                         ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile}
                          ${CMAKE_BINARY_DIR}/share/scan-build/
-                       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile})
+                       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile})
     list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-build/${ShareFile})
-    install(FILES share/${ShareFile} DESTINATION share/scan-build)
+    install(FILES share/scan-build/${ShareFile} DESTINATION share/scan-build)
   endforeach()
 
   add_custom_target(scan-build ALL DEPENDS ${Depends})
diff --git a/clang/tools/scan-build/Makefile b/clang/tools/scan-build/Makefile
index a9e072aa3c6..4ee949346f8 100644
--- a/clang/tools/scan-build/Makefile
+++ b/clang/tools/scan-build/Makefile
@@ -33,18 +33,18 @@ endif
 
 all:: $(InstallTargets)
 
-$(ToolDir)/%: % Makefile $(ToolDir)/.dir
+$(ToolDir)/%: bin/% Makefile $(ToolDir)/.dir
 	$(Echo) "Copying $(notdir $<) to the 'bin' directory..."
 	$(Verb)cp $< $@
 	$(Verb)chmod +x $@
 
-$(LibexecDir)/%: % Makefile $(LibexecDir)/.dir
+$(LibexecDir)/%: libexec/% Makefile $(LibexecDir)/.dir
 	$(Echo) "Copying $(notdir $<) to the 'libexec' directory..."
 	$(Verb)cp $< $@
 	$(Verb)chmod +x $@
 
-$(ShareDir)/man/man1/%: % Makefile $(ShareDir)/man/man1/.dir
-	$(Echo) "Copying $(notdir $<) to the 'share' directory..."
+$(ShareDir)/man/man1/%: man/% Makefile $(ShareDir)/man/man1/.dir
+	$(Echo) "Copying $(notdir $<) to the 'man' directory..."
 	$(Verb)cp $< $@
 
 $(ShareDir)/scan-build/%: share/% Makefile $(ShareDir)/scan-build/.dir
diff --git a/clang/tools/scan-build/scan-build b/clang/tools/scan-build/bin/scan-build
index f37b412498e..6a14484970a 100755
--- a/clang/tools/scan-build/scan-build
+++ b/clang/tools/scan-build/bin/scan-build
@@ -1818,6 +1818,7 @@ if (defined $Options{OutputFormat}) {
       Diag "Viewing analysis results in '$Options{OutputDir}' using scan-view.\n";
       my $ScanView = Cwd::realpath("$RealBin/scan-view");
       if (! -x $ScanView) { $ScanView = "scan-view"; }
+      if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/../../scan-view/bin/scan-view"); }
       exec $ScanView, "$Options{OutputDir}";
     }
 
diff --git a/clang/tools/scan-build/scan-build.bat b/clang/tools/scan-build/bin/scan-build.bat
index 77be6746318..77be6746318 100644
--- a/clang/tools/scan-build/scan-build.bat
+++ b/clang/tools/scan-build/bin/scan-build.bat
diff --git a/clang/tools/scan-build/set-xcode-analyzer b/clang/tools/scan-build/bin/set-xcode-analyzer
index 8e674823ba6..8e674823ba6 100755
--- a/clang/tools/scan-build/set-xcode-analyzer
+++ b/clang/tools/scan-build/bin/set-xcode-analyzer
diff --git a/clang/tools/scan-build/c++-analyzer b/clang/tools/scan-build/libexec/c++-analyzer
index dda5db9c7d9..dda5db9c7d9 100755
--- a/clang/tools/scan-build/c++-analyzer
+++ b/clang/tools/scan-build/libexec/c++-analyzer
diff --git a/clang/tools/scan-build/c++-analyzer.bat b/clang/tools/scan-build/libexec/c++-analyzer.bat
index 69f048a9167..69f048a9167 100644
--- a/clang/tools/scan-build/c++-analyzer.bat
+++ b/clang/tools/scan-build/libexec/c++-analyzer.bat
diff --git a/clang/tools/scan-build/ccc-analyzer b/clang/tools/scan-build/libexec/ccc-analyzer
index 831dd42e9c9..831dd42e9c9 100755
--- a/clang/tools/scan-build/ccc-analyzer
+++ b/clang/tools/scan-build/libexec/ccc-analyzer
diff --git a/clang/tools/scan-build/ccc-analyzer.bat b/clang/tools/scan-build/libexec/ccc-analyzer.bat
index 2a85376eb82..2a85376eb82 100644
--- a/clang/tools/scan-build/ccc-analyzer.bat
+++ b/clang/tools/scan-build/libexec/ccc-analyzer.bat
diff --git a/clang/tools/scan-build/scan-build.1 b/clang/tools/scan-build/man/scan-build.1
index 3d3a9f8efeb..3d3a9f8efeb 100644
--- a/clang/tools/scan-build/scan-build.1
+++ b/clang/tools/scan-build/man/scan-build.1
diff --git a/clang/tools/scan-build/share/scanview.css b/clang/tools/scan-build/share/scan-build/scanview.css
index cf8a5a6ad47..cf8a5a6ad47 100644
--- a/clang/tools/scan-build/share/scanview.css
+++ b/clang/tools/scan-build/share/scan-build/scanview.css
diff --git a/clang/tools/scan-build/share/sorttable.js b/clang/tools/scan-build/share/scan-build/sorttable.js
index 32faa078d89..32faa078d89 100644
--- a/clang/tools/scan-build/share/sorttable.js
+++ b/clang/tools/scan-build/share/scan-build/sorttable.js