Install directly to CoreCLR location

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0823058..ae26daf 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,19 +10,15 @@ set(CLR_CMAKE_PLATFORM_UNIX 1)
 if (CLR_CMAKE_TARGET_ARCH_AMD64)
     set(ARCH_SOURCES_DIR amd64)
     set(CLR_CMAKE_PLATFORM_UNIX_AMD64)
-    set(LIB64 TRUE)
 elseif (CLR_CMAKE_TARGET_ARCH_ARM64)
     set(ARCH_SOURCES_DIR arm64)
     set(CLR_CMAKE_PLATFORM_UNIX_ARM64)
-    set(LIB64 TRUE)
 elseif (CLR_CMAKE_TARGET_ARCH_ARM)
     set(ARCH_SOURCES_DIR arm)
     set(CLR_CMAKE_PLATFORM_UNIX_ARM)
-    set(LIB64 FALSE)
 elseif (CLR_CMAKE_TARGET_ARCH_I386)
     set(ARCH_SOURCES_DIR i386)
     set(CLR_CMAKE_PLATFORM_UNIX_I386)
-    set(LIB64 FALSE)
 else ()
     clr_unknown_arch()
 endif ()

diff --git a/packaging/coreprofiler.spec b/packaging/coreprofiler.spec
index 6c152cb..405789f 100644 (file)
--- a/packaging/coreprofiler.spec
+++ b/packaging/coreprofiler.spec
@@ -26,13 +26,6 @@ Requires: coreclr
 %define netshareddir    %{dotnetdir}/shared
 %define netcoreappdir   %{netshareddir}/Microsoft.NETCore.App/%{dotnet_version}
 
-%define install_prefix /usr/local
-%ifarch x86_64 aarch64
-%define library_dir %{install_prefix}/lib64
-%else
-%define library_dir %{install_prefix}/lib
-%endif
-
 %ifarch x86_64
 %define ARCH AMD64
 %endif
@@ -84,7 +77,6 @@ cmake ../coreprofiler \
     -DCMAKE_CXX_COMPILER=clang++ \
     -DCLR_BIN_DIR=%{_datarootdir}/%{netcoreappdir} \
     -DCLR_SRC_DIR=%{_datarootdir}/%{netcoreappdir} \
-    -DCMAKE_INSTALL_PREFIX=%{install_prefix} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCLR_CMAKE_TARGET_ARCH_%{ARCH}=1
 make %{?jobs:-j%jobs}
@@ -92,10 +84,6 @@ make %{?jobs:-j%jobs}
 %install
 cd build
 %make_install
-mkdir -p %{buildroot}%{_datarootdir}/%{netcoreappdir}
-install %{buildroot}%{library_dir}/*.so %{buildroot}%{_datarootdir}/%{netcoreappdir}
-rm -rf %{buildroot}%{library_dir}
-rm -rf %{buildroot}/usr/lib/debug/%{library_dir}
 
 %files
 %manifest coreprofiler.manifest

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5c14c76..a938ad5 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -94,10 +94,4 @@ target_link_libraries(coreprof
   ${PROFILER_LINK_LIBRARIES}
 )
 
-if(LIB64)
-  set(LIBSUFFIX 64)
-else(LIB64)
-  set(LIBSUFFIX "")
-endif()
-
-install(TARGETS coreprof DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIBSUFFIX})
+install(TARGETS coreprof DESTINATION ${CLR_BIN_DIR})