diff --git a/CMakeLists.txt b/CMakeLists.txt
index df0a1d955014bad9adf73ae4fe136590df1f726d..313c866ff3903f3fee69a23dee91251ddc8f4692 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,6 +69,8 @@ set(srcs
 
 include_directories(include)
 add_library(hqr ${srcs})
+set_property(TARGET hqr PROPERTY INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+
 target_link_libraries( hqr m )
 
 add_subdirectory(testings)
diff --git a/cmake_modules/GenHQRPkgConfig.cmake b/cmake_modules/GenHQRPkgConfig.cmake
index efe61507bbb837a0a25ad010d704d31274d5d917..6da92777abff86d934d6b61f1a12747319766180 100644
--- a/cmake_modules/GenHQRPkgConfig.cmake
+++ b/cmake_modules/GenHQRPkgConfig.cmake
@@ -75,7 +75,7 @@
 
 ###
 #
-# GENERATE_PKGCONFIG_FILE: generate files libhqr.pc
+# GENERATE_PKGCONFIG_FILE: generate files hqr.pc
 #
 ###
 macro(GENERATE_HQR_PKGCONFIG_FILE)
@@ -85,9 +85,9 @@ macro(GENERATE_HQR_PKGCONFIG_FILE)
   set(HQR_PKGCONFIG_REQUIRED "")
   set(HQR_PKGCONFIG_REQUIRED_PRIVATE "")
 
-  #clean_lib_list(LIBHQR)
+  #clean_lib_list(HQR)
 
-  set(_output_libhqr_file "${CMAKE_BINARY_DIR}/hqr.pc")
+  set(_output_hqr_file "${CMAKE_BINARY_DIR}/hqr.pc")
   configure_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/lib/pkgconfig/hqr.pc.in"
     "${_output_hqr_file}"
@@ -97,6 +97,7 @@ macro(GENERATE_HQR_PKGCONFIG_FILE)
     FILES ${_output_hqr_file}
     DESTINATION lib/pkgconfig
     )
+
 endmacro(GENERATE_HQR_PKGCONFIG_FILE)
 
 ##
diff --git a/lib/pkgconfig/hqr.pc.in b/lib/pkgconfig/hqr.pc.in
index 31864a4f4c6bae665805552565ee1e7cf327381a..4ae7cbbcab1516d0afaf80e1d7c9e5b383c499ed 100644
--- a/lib/pkgconfig/hqr.pc.in
+++ b/lib/pkgconfig/hqr.pc.in
@@ -1,13 +1,13 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
-includdir=${exec_prefix}/include
+includedir=${exec_prefix}/include
 
 Name: HQR
 Description: Build and Visualize Trees for Hierachical QR Factorizations
-Version: @LIBHQR_VERSION_MAJOR@.@LIBHQR_VERSION_MINOR@.@LIBHQR_VERSION_MICRO@
+Version: @HQR_VERSION_MAJOR@.@HQR_VERSION_MINOR@.@HQR_VERSION_MICRO@
 Cflags: -I${includedir}
-Libs: -L${libdir} @LIBHQR_PKGCONFIG_LIBS@
-Libs.private: @LIBHQR_PKGCONFIG_LIBS_PRIVATE@
-Requires: @LIBHQR_PKGCONFIG_REQUIRED@
-Requires.private: @LIBHQR_PKGCONFIG_REQUIRED_PRIVATE@
+Libs: -L${libdir} @HQR_PKGCONFIG_LIBS@
+Libs.private: @HQR_PKGCONFIG_LIBS_PRIVATE@
+Requires: @HQR_PKGCONFIG_REQUIRED@
+Requires.private: @HQR_PKGCONFIG_REQUIRED_PRIVATE@
diff --git a/testings/CMakeLists.txt b/testings/CMakeLists.txt
index a0bf66c7da76e5e89297b81a7428c99feaf4e111..08d4d2a3ceeae1f3ce879375b0d5043cf8af82b5 100644
--- a/testings/CMakeLists.txt
+++ b/testings/CMakeLists.txt
@@ -11,6 +11,12 @@
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
+if ( NOT BUILD_SUBPROJECT )
+  set( HQR_INSTALL_DIR bin/hqr )
+else()
+  set( HQR_INSTALL_DIR bin )
+endif()
+
 set(TESTINGS
   draw_hqr.c
   draw_systolic.c
@@ -26,9 +32,9 @@ foreach (_file ${TESTINGS})
 
   install(
     TARGETS ${_name_we}
-    RUNTIME DESTINATION lib/libhqr/examples )
+    RUNTIME DESTINATION ${HQR_INSTALL_DIR} )
   install(
     FILES   ${_file}
-    DESTINATION lib/libhqr/examples )
+    DESTINATION ${HQR_INSTALL_DIR} )
 
 endforeach()