From 7d0eccecab339ce3e0f1dd3a1bf107dfcc40af0f Mon Sep 17 00:00:00 2001
From: Patrick von Reth <vonreth@kde.org>
Date: Mon, 24 Mar 2014 18:15:06 +0100
Subject: [PATCH] dont suffix the deamon

---
 cmake/modules/NoKDE.cmake    | 4 ++++
 share/CMakeLists.txt         | 4 ++--
 share/snorenotify.desktop.in | 4 ++--
 src/CMakeLists.txt           | 3 +--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/cmake/modules/NoKDE.cmake b/cmake/modules/NoKDE.cmake
index 36dfe2c..1269d05 100644
--- a/cmake/modules/NoKDE.cmake
+++ b/cmake/modules/NoKDE.cmake
@@ -29,3 +29,7 @@ endif()
 if(WIN32)
     add_definitions(-DQT_NO_DEBUG -DQT_FORCE_ASSERTS -D_WIN32_WINNT=0x0501)
 endif()
+
+
+set(XDG_APPS_INSTALL_DIR  ${CMAKE_INSTALL_PREFIX}/share/applications)
+
diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
index 64bf77a..ce47501 100644
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@@ -2,8 +2,8 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/FindLibsnore.cmake.in" "${CMAKE_CURR
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/FindLibsnore${SNORE_SUFFIX}.cmake" DESTINATION share/apps/cmake/modules)
 
 if(UNIX  AND WITH_SNORE_DEAMON)
-    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/snorenotify.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/snorenotify${SNORE_SUFFIX}.desktop" @ONLY)
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/snorenotify${SNORE_SUFFIX}.desktop" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/snorenotify.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/snorenotify.desktop" @ONLY)
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/snorenotify.desktop" DESTINATION ${XDG_APPS_INSTALL_DIR})
 endif(UNIX AND WITH_SNORE_DEAMON)
 
 if(WIN32)
diff --git a/share/snorenotify.desktop.in b/share/snorenotify.desktop.in
index b594eed..a9c7ac8 100644
--- a/share/snorenotify.desktop.in
+++ b/share/snorenotify.desktop.in
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Type=Application
 Version=@SNORE_VERSION_MAJOR@.@SNORE_VERSION_MINOR@@SNORE_VERSION_SUFFIX@
-Name=SnoreNotify@SNORE_SUFFIX@
+Name=SnoreNotify
 Comment=An application redirecting freedesktop notifications to a unified notification backed
 Icon=snore
-Exec=snorenotify@SNORE_SUFFIX@
+Exec=snorenotify
 Categories=Qt;System;
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ea41eee..48fca90 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,6 @@ add_subdirectory(core)
 if(WITH_SNORE_DEAMON)
 
     add_executable( snorenotify WIN32 main.cpp snorenotify.cpp trayicon.cpp ${SNORENOTIFY_DEAMON_DEPS})
-    set_target_properties(snorenotify PROPERTIES OUTPUT_NAME "snorenotify${SNORE_SUFFIX}")
     target_link_libraries( snorenotify snorecore ${QT_QTGUI_LIBRARY} )
 
     if(KDE4_FOUND)
@@ -20,6 +19,6 @@ if(WITH_SNORE_DEAMON)
     install(TARGETS snorenotify RUNTIME DESTINATION bin
                               LIBRARY DESTINATION lib
                               ARCHIVE DESTINATION lib)
-    endif()
+endif()
 
 add_subdirectory(plugins)