]>
Commit | Line | Data |
---|---|---|
a9828edf JB |
1 | --- widelands-build21/xdg/CMakeLists.txt.orig 2020-07-12 21:33:44.000000000 +0200 |
2 | +++ widelands-build21/xdg/CMakeLists.txt 2020-07-29 06:20:12.689266184 +0200 | |
3 | @@ -6,19 +6,19 @@ | |
4 | list(APPEND icon_sizes "16" "32" "48" "64" "128") | |
5 | foreach (icon_size ${icon_sizes}) | |
6 | #install(FILES ${CMAKE_SOURCE_DIR}/data/images/logos/wl-ico-${icon_size}.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${icon_size}x${icon_size}/apps RENAME ${XDG_APPLICATION_ID}.png) | |
7 | - install(FILES ${CMAKE_SOURCE_DIR}/data/images/logos/wl-ico-${icon_size}.png DESTINATION ../share/icons/hicolor/${icon_size}x${icon_size}/apps RENAME ${XDG_APPLICATION_ID}.png) | |
8 | + install(FILES ${CMAKE_SOURCE_DIR}/data/images/logos/wl-ico-${icon_size}.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/${icon_size}x${icon_size}/apps RENAME ${XDG_APPLICATION_ID}.png) | |
9 | endforeach (icon_size ${icon_sizes}) | |
10 | #install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.6 DESTINATION ${CMAKE_INSTALL_MANDIR}/man6) | |
11 | -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.6 DESTINATION ../share/man/man6) | |
12 | +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.6 DESTINATION ${CMAKE_INSTALL_DATADIR}/man/man6) | |
13 | #install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications) | |
14 | -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.desktop DESTINATION ../share/applications) | |
15 | +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) | |
16 | #install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo) | |
17 | -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.appdata.xml DESTINATION ../share/metainfo) | |
18 | +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.appdata.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo) | |
19 | ||
20 | find_program(GTK_UPDATE_ICON_CACHE NAMES gtk-update-icon-cache) | |
21 | if (GTK_UPDATE_ICON_CACHE) | |
22 | #install(CODE "execute_process (COMMAND ${GTK_UPDATE_ICON_CACHE} -t -f ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor ||: )") | |
23 | - install(CODE "execute_process (COMMAND ${GTK_UPDATE_ICON_CACHE} -t -f ${CMAKE_INSTALL_PREFIX}/../share/icons/hicolor ||: )") | |
24 | + install(CODE "execute_process (COMMAND ${GTK_UPDATE_ICON_CACHE} -t -f ${CMAKE_INSTALL_DATADIR}/icons/hicolor ||: )") | |
25 | else (GTK_UPDATE_ICON_CACHE) | |
26 | message(WARNING "gtk-update-icon-cache not found!") | |
27 | endif (GTK_UPDATE_ICON_CACHE) |