diff --git a/libs/oeserverd/CMakeLists.txt b/libs/oeserverd/CMakeLists.txt
index aefa3a7b..d9cfed25 100644
--- a/libs/oeserverd/CMakeLists.txt
+++ b/libs/oeserverd/CMakeLists.txt
@@ -14,7 +14,7 @@ macro (install_libs libs)
       FILES ${lib}
       PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE GROUP_READ GROUP_EXECUTE
                   WORLD_READ WORLD_EXECUTE
-      DESTINATION ${CMAKE_INSTALL_PREFIX}/${_oe_libdir}
+      DESTINATION ${_oe_libdir}
     )
   endforeach ()
 endmacro () 
@@ -23,14 +23,14 @@ if (EXISTS "/etc/udev/rules.d")
   install(
     FILES "linux/98-sglock.rules"
     PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
-    DESTINATION "${CMAKE_INSTALL_PREFIX}/etc/udev/rules.d"
+    DESTINATION "etc/udev/rules.d"
   )
 endif ()
 
 if (QT_ANDROID)
-  configure_file(
-    ${CMAKE_CURRENT_LIST_DIR}/oeserverda_android/oeserverda
-    ${CMAKE_INSTALL_PREFIX}/bin/oeserverda COPYONLY
+  install(
+    FILES ${CMAKE_CURRENT_LIST_DIR}/oeserverda_android/oeserverda
+    TYPE BIN
   )
 elseif (APPLE)
   install_libs("osx/oeserverd" "osx/libsglmac-2.29.0.0.dylib.x86_64")
@@ -45,41 +45,41 @@ elseif (APPLE)
     ${CMAKE_BINARY_DIR}/libsglmac-2.29.0.0.dylib.x86_64 COPYONLY
   )
 elseif (UNIX AND ARCH  STREQUAL "x86_64")
-  configure_file(
-    ${CMAKE_CURRENT_LIST_DIR}/linux64/oeserverd
-    ${CMAKE_INSTALL_PREFIX}/bin/oeserverd COPYONLY
+  install(
+    FILES ${CMAKE_CURRENT_LIST_DIR}/linux64/oeserverd
+    TYPE BIN
   )
-  configure_file(
-    ${CMAKE_CURRENT_LIST_DIR}/linux64/libsgllnx64-2.29.02.so
-    ${CMAKE_INSTALL_PREFIX}/bin/libsgllnx64-2.29.02.so COPYONLY
+  install(
+    FILES ${CMAKE_CURRENT_LIST_DIR}/linux64/libsgllnx64-2.29.02.so
+    TYPE BIN
   )
 elseif (UNIX AND ARCH STREQUAL "armhf")
-  configure_file(
-    ${CMAKE_CURRENT_LIST_DIR}/linuxarm/oeserverd
-    ${CMAKE_INSTALL_PREFIX}/bin/oeserverd COPYONLY
+  install(
+    FILES ${CMAKE_CURRENT_LIST_DIR}/linuxarm/oeserverd
+    TYPE BIN
   )
-  configure_file(
-    ${CMAKE_CURRENT_LIST_DIR}/linuxarm/libsglarmhf32-2.30.0.0.so
-    ${CMAKE_INSTALL_PREFIX}/bin/libsglarmhf32-2.30.0.0.so COPYONLY
+  install(
+    FILES ${CMAKE_CURRENT_LIST_DIR}/linuxarm/libsglarmhf32-2.30.0.0.so
+    TYPE BIN
   )
 elseif (UNIX AND ARCH STREQUAL "arm64")
-  configure_file(
-    ${CMAKE_CURRENT_LIST_DIR}/linuxarm64/oeserverd
-    ${CMAKE_INSTALL_PREFIX}/bin/oeserverd COPYONLY
+  install(
+    FILES ${CMAKE_CURRENT_LIST_DIR}/linuxarm64/oeserverd
+    TYPE BIN
   )
-  configure_file(
-    ${CMAKE_CURRENT_LIST_DIR}/linuxarm64/libsglarm64-2.31.0.0.so
-    ${CMAKE_INSTALL_PREFIX}/bin/libsglarm64-2.31.0.0.so COPYONLY
+  install(
+    FILES ${CMAKE_CURRENT_LIST_DIR}/linuxarm64/libsglarm64-2.31.0.0.so
+    TYPE BIN
   )
 elseif (UNIX)
   # 32-bit amd64: is this really useful?
-  configure_file(
-    ${CMAKE_CURRENT_LIST_DIR}/linux/oeserverd
-    ${CMAKE_INSTALL_PREFIX}/bin/oeserverd COPYONLY
+  install(
+    FILES ${CMAKE_CURRENT_LIST_DIR}/linux/oeserverd
+    TYPE BIN
   )
-  configure_file(
-    ${CMAKE_CURRENT_LIST_DIR}/linux/libsgllnx-2.29.0.1.so
-    ${CMAKE_INSTALL_PREFIX}/bin/libsgllnx-2.29.0.1.so COPYONLY
+  install(
+    FILES ${CMAKE_CURRENT_LIST_DIR}/linux/libsgllnx-2.29.0.1.so
+    TYPE BIN
   )
 elseif (WIN32)
   file(GLOB_RECURSE vcdll_files "win/*.dll")