--- a/CMakeLists.txt	2020-08-23 10:14:54.337838565 +0200
+++ b/CMakeLists.txt	2020-08-23 10:18:26.993837753 +0200
@@ -14,6 +14,8 @@
 #example command:
 # cmake -DCMAKE_PREFIX_PATH=/path/to/ROCclr/build/or/install ..
 
+include (GNUInstallDirs)
+
 set(OPENCL_ICD_LOADER_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2" CACHE PATH "")
 option(BUILD_SHARED_LIBS "Build shared libs" ON)
 
@@ -60,7 +62,7 @@
 
 add_subdirectory(khronos/icd)
 add_subdirectory(amdocl)
-add_subdirectory(tools/clinfo)
+#add_subdirectory(tools/clinfo)
 add_subdirectory(tools/cltrace)
 if(BUILD_TESTS)
   add_subdirectory(tests/ocltst)
@@ -96,34 +98,34 @@
 ###--- Packaging ------------------------------------------------------------###
 
 # MAIN package
-install(PROGRAMS $<TARGET_FILE:clinfo>
-        DESTINATION bin
-        COMPONENT MAIN)
-install(PROGRAMS $<TARGET_FILE:cltrace>
-        DESTINATION lib
-        COMPONENT MAIN)
+#install(PROGRAMS $<TARGET_FILE:clinfo>
+#        DESTINATION bin
+#        COMPONENT MAIN)
+#install(PROGRAMS $<TARGET_FILE:cltrace>
+#        DESTINATION lib
+#        COMPONENT MAIN)
 install(PROGRAMS $<TARGET_FILE:amdocl64>
-        DESTINATION lib
-        COMPONENT MAIN)
-install(PROGRAMS $<TARGET_FILE:OpenCL>
-        DESTINATION lib
-        COMPONENT MAIN)
-install(PROGRAMS $<TARGET_SONAME_FILE:OpenCL>
-        DESTINATION lib
+        DESTINATION lib64
         COMPONENT MAIN)
+#install(PROGRAMS $<TARGET_FILE:OpenCL>
+#        DESTINATION lib
+#        COMPONENT MAIN)
+#install(PROGRAMS $<TARGET_SONAME_FILE:OpenCL>
+#        DESTINATION lib
+#        COMPONENT MAIN)
 
 # DEV package
-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2/CL"
-        DESTINATION include
-        COMPONENT DEV
-        USE_SOURCE_PERMISSIONS
-        PATTERN cl_d3d10.h EXCLUDE
-        PATTERN cl_d3d11.h EXCLUDE
-        PATTERN cl_dx9_media_sharing.h EXCLUDE
-        PATTERN cl_egl.h EXCLUDE)
-install(PROGRAMS $<TARGET_LINKER_FILE:OpenCL>
-        DESTINATION lib
-        COMPONENT DEV)
+#install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2/CL"
+#        DESTINATION include
+#        COMPONENT DEV
+#        USE_SOURCE_PERMISSIONS
+#        PATTERN cl_d3d10.h EXCLUDE
+#        PATTERN cl_d3d11.h EXCLUDE
+#        PATTERN cl_dx9_media_sharing.h EXCLUDE
+#        PATTERN cl_egl.h EXCLUDE)
+#install(PROGRAMS $<TARGET_LINKER_FILE:OpenCL>
+#        DESTINATION lib
+#        COMPONENT DEV)
 
 #############################
 # Packaging steps