[KDEInstallDirs] Port away from deprecated variable names and always …

…install our carddeck
benni0815 · Aug 5, 2024 · 63db7dc · 63db7dc
1 parent 834168f
commit 63db7dc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -43,11 +43,8 @@ add_subdirectory(icons)
 # add install target:
 GETTEXT_PROCESS_PO_FILES(de ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} po/de/schafkopf.po)
 
-set(INSTALL_OPEN_TAROCK OFF CACHE BOOL "Install the OpenTarock card deck")
-set(CARDDECK_DIRECTORY ${DATA_INSTALL_DIR}/carddecks CACHE PATH "The directories for carddeck installation.")
-if(INSTALL_OPEN_TAROCK)
-  install(DIRECTORY carddecks/svg-open-tarock DESTINATION ${CARDDECK_DIRECTORY})
-endif(INSTALL_OPEN_TAROCK)
+set(CARDDECK_DIRECTORY ${KDE_INSTALL_FULL_DATADIR}/carddecks CACHE PATH "The directory for carddeck installation.")
+install(DIRECTORY carddecks/svg-open-tarock DESTINATION ${CARDDECK_DIRECTORY})
 
 set(CPACK_GENERATOR "DEB")
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Benni")

diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
@@ -8,5 +8,5 @@ set(schafkopf_icons
 )
 
 ecm_install_icons(ICONS ${schafkopf_icons}
-  DESTINATION ${ICON_INSTALL_DIR}
+  DESTINATION ${KDE_INSTALL_FULL_ICONDIR}
 )