]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Fix create_symlink path to DESTDIR instead of root file system
authorArfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Sat, 4 May 2019 11:26:00 +0000 (13:26 +0200)
committerAndreas Sturmlechner <andreas.sturmlechner@gmail.com>
Sat, 4 May 2019 11:45:16 +0000 (13:45 +0200)
Test Plan: Builds fine again in a sandbox, with the symlink properly installed.

Reviewers: #dolphin, elvisangelaccio

Reviewed By: #dolphin, elvisangelaccio

Subscribers: davidedmundson, elvisangelaccio, kfm-devel, ngraham

Tags: #dolphin

Differential Revision: https://phabricator.kde.org/D21011

src/CMakeLists.txt

index 63de0932438149a058de8f7ec3f16879828fffb3..fb288e4412ccc0bdba80019067fecb79c57dd908 100644 (file)
@@ -387,7 +387,7 @@ install( PROGRAMS org.kde.dolphin.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
 install( DIRECTORY DESTINATION "${KDE_INSTALL_FULL_DATAROOTDIR}/kglobalaccel" )
 
 install(
-    CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ${KDE_INSTALL_FULL_APPDIR}/org.kde.dolphin.desktop ${KDE_INSTALL_FULL_DATAROOTDIR}/kglobalaccel/org.kde.dolphin.desktop)"
+    CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink \"${KDE_INSTALL_FULL_APPDIR}/org.kde.dolphin.desktop\" \"\$ENV{DESTDIR}${KDE_INSTALL_FULL_DATAROOTDIR}/kglobalaccel/org.kde.dolphin.desktop\")"
 )
 
 install( FILES settings/dolphin_directoryviewpropertysettings.kcfg