diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index f5eb708..6027b8f 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -104,10 +104,10 @@ endif() install(TARGETS ktikz DESTINATION ${KDE_INSTALL_BINDIR}) if(KTIKZ_USE_KTEXTEDITOR) - install(FILES ktikzui_frameworks.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/ktikz) + install(FILES kxmlgui5/ktikz/ktikzui_frameworks.rc DESTINATION ${KDE_INSTALL_KXMLGUIDIR}/ktikz) endif() -install(FILES ktikzui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/ktikz) +install(FILES kxmlgui5/ktikz/ktikzui.rc DESTINATION ${KDE_INSTALL_KXMLGUIDIR}/ktikz) install(FILES ../common/ktikz.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR}) add_subdirectory(icons) @@ -119,8 +119,8 @@ add_custom_command( COMMAND ${CMAKE_COMMAND} -E remove_directory ${KTIKZ_TRANSLATIONS_INSTALL_DIR} COMMAND ${CMAKE_COMMAND} -E remove_directory ${KTIKZ_TEMPLATES_INSTALL_DIR} COMMAND ${CMAKE_COMMAND} -E remove_directory ${KTIKZ_DATA_INSTALL_DIR} - COMMAND ${CMAKE_COMMAND} -E remove_directory ${KXMLGUI_INSTALL_DIR}/ktikz + COMMAND ${CMAKE_COMMAND} -E remove_directory ${KDE_INSTALL_KXMLGUIDIR}/ktikz COMMENT - "Removing directories ${KTIKZ_TRANSLATIONS_INSTALL_DIR} ${KTIKZ_TEMPLATES_INSTALL_DIR} ${KTIKZ_DATA_INSTALL_DIR} ${KXMLGUI_INSTALL_DIR}/ktikz" + "Removing directories ${KTIKZ_TRANSLATIONS_INSTALL_DIR} ${KTIKZ_TEMPLATES_INSTALL_DIR} ${KTIKZ_DATA_INSTALL_DIR} ${KDE_INSTALL_KXMLGUIDIR}/ktikz" VERBATIM ) diff --git a/app/ktikzui.rc b/app/kxmlgui5/ktikz/ktikzui.rc similarity index 100% rename from app/ktikzui.rc rename to app/kxmlgui5/ktikz/ktikzui.rc diff --git a/app/ktikzui_frameworks.rc b/app/kxmlgui5/ktikz/ktikzui_frameworks.rc similarity index 100% rename from app/ktikzui_frameworks.rc rename to app/kxmlgui5/ktikz/ktikzui_frameworks.rc