Index: KF5PackageMacros.cmake
===================================================================
--- KF5PackageMacros.cmake
+++ KF5PackageMacros.cmake
@@ -1,9 +1,8 @@
 
-find_package(ECM 0.0.9 CONFIG REQUIRED)
+find_package(ECM 1.6.0 CONFIG REQUIRED)
 include(KDEInstallDirs)
 
 set(KPACKAGE_RELATIVE_DATA_INSTALL_DIR "kpackage")
-set(KPACKAGE_DATA_INSTALL_DIR "${DATA_INSTALL_DIR}/${KPACKAGE_RELATIVE_DATA_INSTALL_DIR}")
 
 # kpackage_install_package(path componentname [root] [install_dir])
 #
@@ -14,7 +13,7 @@
 # @arg root The subdirectory to install to, default: packages
 # @arg install_dir the path where to install packages, 
 #       such as myapp, that would go under prefix/share/myapp:
-#       default ${KPACKAGE_DATA_INSTALL_DIR}
+#       default ${KPACKAGE_RELATIVE_DATA_INSTALL_DIR}
 #
 # Examples:
 # kpackage_install_package(mywidget org.kde.plasma.mywidget plasmoids) # installs an applet
@@ -31,7 +30,7 @@
    if(NOT install_dir)
       set(install_dir ${KPACKAGE_RELATIVE_DATA_INSTALL_DIR})
    endif()
-   install(DIRECTORY ${dir}/ DESTINATION ${DATA_INSTALL_DIR}/${install_dir}/${root}/${component}
+   install(DIRECTORY ${dir}/ DESTINATION ${KDE_INSTALL_DATADIR}/${install_dir}/${root}/${component}
            PATTERN .svn EXCLUDE
            PATTERN CMakeLists.txt EXCLUDE
            PATTERN Messages.sh EXCLUDE
@@ -47,7 +46,7 @@
         install(FILES ${APPDATAFILE} DESTINATION ${KDE_INSTALL_METAINFODIR})
    endif()
 
-   set(newentry "${kpackagetool_cmd} --generate-index -g -p ${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}/${install_dir}/${root}\n")
+   set(newentry "${kpackagetool_cmd} --generate-index -g -p ${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_DATADIR}/${install_dir}/${root}\n")
    get_directory_property(currentindex kpackageindex)
    string(FIND "${currentindex}" "${newentry}" alreadyin)
    if (alreadyin LESS 0)