Skip to content

Commit 0fa3816

Browse files
deveeedeveee
committed
Install icons in $PREFIX/share/icons/hicolor path.
Don't use static paths in .desktop file. Actually I don't know about any application which uses it :P
1 parent 7bff688 commit 0fa3816

2 files changed

Lines changed: 5 additions & 8 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -368,10 +368,8 @@ install(DIRECTORY ${STK_DATA_DIR} DESTINATION ${STK_INSTALL_DATA_DIR} PATTERN ".
368368
if(STK_ASSETS_DIR AND CHECK_ASSETS)
369369
install(DIRECTORY ${STK_ASSETS_DIR} DESTINATION ${STK_INSTALL_DATA_DIR}/data PATTERN ".svn" EXCLUDE PATTERN ".git" EXCLUDE)
370370
endif()
371-
install(FILES ${PROJECT_BINARY_DIR}/supertuxkart.desktop DESTINATION share/applications)
371+
install(FILES ${STK_DATA_DIR}/supertuxkart.desktop DESTINATION share/applications)
372+
install(FILES data/supertuxkart_32.png DESTINATION share/icons/hicolor/32x32 RENAME supertuxkart.png)
373+
install(FILES data/supertuxkart_128.png DESTINATION share/icons/hicolor/128x128 RENAME supertuxkart.png)
372374
install(FILES data/supertuxkart_32.png data/supertuxkart_128.png DESTINATION share/pixmaps)
373375
install(FILES data/supertuxkart.appdata DESTINATION share/appdata)
374-
375-
set(PREFIX ${CMAKE_INSTALL_PREFIX})
376-
configure_file(data/supertuxkart_desktop.template supertuxkart.desktop)
377-
add_dependencies(supertuxkart supertuxkart.desktop)

data/supertuxkart_desktop.template renamed to data/supertuxkart.desktop

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
[Desktop Entry]
22
Name=SuperTuxKart
3-
Icon=@PREFIX@/share/pixmaps/supertuxkart_128.png
3+
Icon=supertuxkart
44
GenericName=A kart racing game
55
GenericName[de]=Ein Kart-Rennspiel
66
GenericName[fr]=Un jeu de karting
77
GenericName[gl]=Xogo de carreiras con karts
88
GenericName[pl]=Wyścigi gokartów
99
GenericName[ro]=Un joc de curse cu carturi
10-
Exec=@PREFIX@/@STK_INSTALL_BINARY_DIR@/supertuxkart --no-console
10+
Exec=supertuxkart
1111
Terminal=false
1212
StartupNotify=false
1313
Type=Application
14-
TryExec=@PREFIX@/@STK_INSTALL_BINARY_DIR@/supertuxkart
1514
Categories=Game;ArcadeGame;

0 commit comments

Comments
 (0)