Merge pull request #6048 , fixes #5844

Fix icon paths on Linux
This commit is contained in:
Andrew Nelless 2017-05-23 10:58:28 +01:00 committed by GitHub
commit 43948f7871
4 changed files with 4 additions and 4 deletions

View File

@ -450,7 +450,7 @@ endif()
# #
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/rpm ${CMAKE_BINARY_DIR}/rpm) configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/rpm ${CMAKE_BINARY_DIR}/rpm)
install(FILES res/synergy.svg DESTINATION share/icons) install(FILES res/synergy.svg DESTINATION share/icons/hicolor/scalable/apps)
if("${VERSION_MAJOR}" STREQUAL "2") if("${VERSION_MAJOR}" STREQUAL "2")
install(FILES res/synergy2.desktop DESTINATION share/applications) install(FILES res/synergy2.desktop DESTINATION share/applications)
else() else()

View File

@ -20,7 +20,7 @@ Work seamlessly across Windows, macOS and Linux.
%{_bindir}/synergys %{_bindir}/synergys
%{_bindir}/syntool %{_bindir}/syntool
%attr(644,-,-) %{_datarootdir}/applications/synergy.desktop %attr(644,-,-) %{_datarootdir}/applications/synergy.desktop
%attr(644,-,-) %{_datarootdir}/icons/synergy.svg %attr(644,-,-) %{_datarootdir}/icons/hicolor/scalable/apps/synergy.svg
%changelog %changelog
* Wed Apr 26 2017 Symless <engineering@symless.com> * Wed Apr 26 2017 Symless <engineering@symless.com>

View File

@ -5,7 +5,7 @@ Name=Synergy
Comment=Keyboard and mouse sharing solution Comment=Keyboard and mouse sharing solution
Path=/usr/bin Path=/usr/bin
Exec=/usr/bin/synergy Exec=/usr/bin/synergy
Icon=/usr/share/icons/synergy.svg Icon=synergy
Terminal=false Terminal=false
Categories=Utility; Categories=Utility;
Keywords=keyboard;mouse;sharing;network;share; Keywords=keyboard;mouse;sharing;network;share;

View File

@ -5,7 +5,7 @@ Name=Synergy
Comment=Keyboard and mouse sharing solution Comment=Keyboard and mouse sharing solution
Path=/usr/bin Path=/usr/bin
Exec=/usr/bin/synergy2 Exec=/usr/bin/synergy2
Icon=/usr/share/icons/synergy.svg Icon=synergy
Terminal=false Terminal=false
Categories=Utility; Categories=Utility;
Keywords=keyboard;mouse;sharing;network;share; Keywords=keyboard;mouse;sharing;network;share;