Index: clang-tools-extra/clang-apply-replacements/tool/CMakeLists.txt
===================================================================
--- clang-tools-extra/clang-apply-replacements/tool/CMakeLists.txt
+++ clang-tools-extra/clang-apply-replacements/tool/CMakeLists.txt
@@ -14,6 +14,3 @@
   clangToolingCore
   clangToolingRefactoring
   )
-
-install(TARGETS clang-apply-replacements
-  RUNTIME DESTINATION bin)
Index: clang-tools-extra/clang-change-namespace/tool/CMakeLists.txt
===================================================================
--- clang-tools-extra/clang-change-namespace/tool/CMakeLists.txt
+++ clang-tools-extra/clang-change-namespace/tool/CMakeLists.txt
@@ -4,7 +4,7 @@
   Support
   )
 
-add_clang_executable(clang-change-namespace
+add_clang_tool(clang-change-namespace
   ClangChangeNamespace.cpp
   )
 target_link_libraries(clang-change-namespace
@@ -20,6 +20,3 @@
   clangTooling
   clangToolingCore
   )
-
-install(TARGETS clang-change-namespace
-  RUNTIME DESTINATION bin)
Index: clang-tools-extra/clang-include-fixer/find-all-symbols/tool/CMakeLists.txt
===================================================================
--- clang-tools-extra/clang-include-fixer/find-all-symbols/tool/CMakeLists.txt
+++ clang-tools-extra/clang-include-fixer/find-all-symbols/tool/CMakeLists.txt
@@ -1,6 +1,6 @@
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
 
-add_clang_executable(find-all-symbols
+add_clang_tool(find-all-symbols
   FindAllSymbolsMain.cpp
   )
 
@@ -16,9 +16,6 @@
   findAllSymbols
   )
 
-install(TARGETS find-all-symbols
-  RUNTIME DESTINATION bin)
-
 install(PROGRAMS run-find-all-symbols.py
   DESTINATION share/clang
   COMPONENT find-all-symbols)
Index: clang-tools-extra/clang-include-fixer/tool/CMakeLists.txt
===================================================================
--- clang-tools-extra/clang-include-fixer/tool/CMakeLists.txt
+++ clang-tools-extra/clang-include-fixer/tool/CMakeLists.txt
@@ -17,9 +17,6 @@
   findAllSymbols
   )
 
-install(TARGETS clang-include-fixer
-  RUNTIME DESTINATION bin)
-
 install(PROGRAMS clang-include-fixer.el
   DESTINATION share/clang
   COMPONENT clang-include-fixer)
Index: clang-tools-extra/clang-move/tool/CMakeLists.txt
===================================================================
--- clang-tools-extra/clang-move/tool/CMakeLists.txt
+++ clang-tools-extra/clang-move/tool/CMakeLists.txt
@@ -1,6 +1,6 @@
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
 
-add_clang_executable(clang-move
+add_clang_tool(clang-move
   ClangMove.cpp
   )
 
Index: clang-tools-extra/clang-query/tool/CMakeLists.txt
===================================================================
--- clang-tools-extra/clang-query/tool/CMakeLists.txt
+++ clang-tools-extra/clang-query/tool/CMakeLists.txt
@@ -1,6 +1,6 @@
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
 
-add_clang_executable(clang-query
+add_clang_tool(clang-query
   ClangQuery.cpp
   )
 target_link_libraries(clang-query
@@ -14,5 +14,3 @@
   clangSerialization
   clangTooling
   )
-
-install(TARGETS clang-query RUNTIME DESTINATION bin)
Index: clang-tools-extra/pp-trace/CMakeLists.txt
===================================================================
--- clang-tools-extra/pp-trace/CMakeLists.txt
+++ clang-tools-extra/pp-trace/CMakeLists.txt
@@ -2,7 +2,7 @@
   Support
   )
 
-add_clang_executable(pp-trace
+add_clang_tool(pp-trace
   PPTrace.cpp
   PPCallbacksTracker.cpp
   )