From f7d1038ba358a295fb46c681db5c47e4ead97306 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Wed, 15 Feb 2012 13:36:06 -0500 Subject: [PATCH] Fix installation of desktop file and related icons. --- CMakeLists.txt | 2 +- remmina/desktop/CMakeLists.txt | 2 +- remmina/desktop/remmina.desktop | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 465e905..13e82d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,7 +78,7 @@ include_directories(.) include_directories(remmina/include) set(REMMINA_VERSION "0.9.99.1") -set(REMMINA_DATADIR "${CMAKE_INSTALL_PREFIX}/share/remmina") +set(REMMINA_DATADIR "${CMAKE_INSTALL_PREFIX}/share") set(REMMINA_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/locale") set(REMMINA_PLUGINDIR "${CMAKE_INSTALL_PREFIX}/lib/remmina/plugins") diff --git a/remmina/desktop/CMakeLists.txt b/remmina/desktop/CMakeLists.txt index f3b7cee..103b090 100644 --- a/remmina/desktop/CMakeLists.txt +++ b/remmina/desktop/CMakeLists.txt @@ -38,4 +38,4 @@ install(FILES ${ICON32_DATA} DESTINATION ${ICON32_DIR}) install(FILES ${ICON48_DATA} DESTINATION ${ICON48_DIR}) install(FILES ${ICONSVG_DATA} DESTINATION ${ICONSVG_DIR}) -install(FILES remmina.desktop DESTINATION share/applications/remmina.desktop) +install(FILES remmina.desktop DESTINATION "${REMMINA_DATADIR}/applications") diff --git a/remmina/desktop/remmina.desktop b/remmina/desktop/remmina.desktop index a1f6443..3136316 100644 --- a/remmina/desktop/remmina.desktop +++ b/remmina/desktop/remmina.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Version=1.0 -_Name=Remmina Remote Desktop Client -_Comment=Connect to remote desktops +Name=Remmina Remote Desktop Client +Comment=Connect to remote desktops TryExec=remmina Exec=remmina Icon=remmina -- 1.7.10