fix Linux build (#2505)

vnotex · May 24, 2024 · f461c70 · f461c70
1 parent 898c82e
commit f461c70
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -144,9 +144,8 @@ else()
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     )
-    # TODO: move them to data dir
-    install(FILES ${VX_EXTRA_RESOURCE_FILES_RCC} DESTINATION ${CMAKE_INSTALL_BINDIR})
-    install(FILES ${VX_QM_FILES} DESTINATION "${CMAKE_INSTALL_BINDIR}/translations" OPTIONAL)
+    install(FILES ${VX_EXTRA_RESOURCE_FILES_RCC} DESTINATION ${CMAKE_INSTALL_DATADIR})
+    install(FILES ${VX_QM_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/translations" OPTIONAL)
 
     set(desktop.path applications)
     set(desktop.files data/core/vnote.desktop)
@@ -166,8 +165,8 @@ else()
     set(iconsvg.files data/core/logo/vnote.svg)
     foreach(item IN ITEMS desktop icon16 icon32 icon48 icon64 icon128 icon256 iconsvg)
         install(FILES ${CMAKE_CURRENT_LIST_DIR}/${${item}.files}
-                DESTINATION share/${${item}.path}
-                PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+            DESTINATION ${CMAKE_INSTALL_DATADIR}/${${item}.path}
+            PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
     endforeach()
 endif()
 

diff --git a/src/core/configmgr.cpp b/src/core/configmgr.cpp
@@ -581,10 +581,15 @@ void ConfigMgr::initAppPrefixPath()
 #if defined(Q_OS_LINUX)
     QDir localBinDir(app_dir_path);
     if (localBinDir.exists("../local/bin/vnote")) {
-        auto app_dir_path2 = localBinDir.cleanPath(localBinDir.filePath("../local/bin"));
+        auto app_dir_path2 = localBinDir.cleanPath(localBinDir.filePath("../local/share"));
         qInfo() << "app prefix path: " << app_dir_path2;
         potential_dirs << app_dir_path2;
     }
+    if (localBinDir.exists("../share")) {
+        auto app_dir_path3 = localBinDir.cleanPath(localBinDir.filePath("../share"));
+        qInfo() << "app prefix path: " << app_dir_path3;
+        potential_dirs << app_dir_path3;
+    }
 #elif defined(Q_OS_MACOS)
     QDir localBinDir(app_dir_path);
     if (localBinDir.exists("../Resources")) {