summaryrefslogtreecommitdiffstats
path: root/kio
diff options
context:
space:
mode:
authorsamelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-10-24 21:53:26 +0000
committersamelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-10-24 21:53:26 +0000
commit40fe6a00b6dde631a68e40731fabb71680a5454c (patch)
tree8e06828694f6a83f427c022e6b44e911eb7e9ed9 /kio
parent6e5ec36b7925e29501aaf12fe5ae5e58d590f63f (diff)
downloadtdelibs-40fe6a00b6dde631a68e40731fabb71680a5454c.tar.gz
tdelibs-40fe6a00b6dde631a68e40731fabb71680a5454c.zip
[kdelibs] follow KDE4 rules for install path names and some other small changes
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1189382 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kio')
-rw-r--r--kio/CMakeLists.txt8
-rw-r--r--kio/kfile/CMakeLists.txt2
-rw-r--r--kio/kioexec/CMakeLists.txt5
-rw-r--r--kio/misc/CMakeLists.txt5
4 files changed, 7 insertions, 13 deletions
diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt
index 9be73d93b..1a548e0fc 100644
--- a/kio/CMakeLists.txt
+++ b/kio/CMakeLists.txt
@@ -38,11 +38,11 @@ install( FILES
application.desktop kurifilterplugin.desktop
kcomprfilter.desktop kscan.desktop kdatatool.desktop
kfileplugin.desktop kcmodule.desktop
- DESTINATION ${SHARE_INSTALL_DIR}/servicetypes )
+ DESTINATION ${SERVICETYPES_INSTALL_DIR} )
-install( FILES kioslave.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
-install( PROGRAMS useragent.pl proxytype.pl DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
-install( FILES renamedlgplugin.desktop DESTINATION ${SHARE_INSTALL_DIR}/servicetypes )
+install( FILES kioslave.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
+install( PROGRAMS useragent.pl proxytype.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
+install( FILES renamedlgplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
install( FILES kpasswdserver.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
install( FILES data.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
diff --git a/kio/kfile/CMakeLists.txt b/kio/kfile/CMakeLists.txt
index b94d12ea0..453654571 100644
--- a/kio/kfile/CMakeLists.txt
+++ b/kio/kfile/CMakeLists.txt
@@ -51,7 +51,7 @@ install( FILES
install( FILES
kpropsdlgplugin.desktop
- DESTINATION ${SHARE_INSTALL_DIR}/servicetypes )
+ DESTINATION ${SERVICETYPES_INSTALL_DIR} )
##### kfile #####################################
diff --git a/kio/kioexec/CMakeLists.txt b/kio/kioexec/CMakeLists.txt
index 995141c0d..043f017c6 100644
--- a/kio/kioexec/CMakeLists.txt
+++ b/kio/kioexec/CMakeLists.txt
@@ -43,7 +43,4 @@ tde_add_executable( ${target} AUTOMOC
DESTINATION ${BIN_INSTALL_DIR}
)
-# FIXME need a review
-# create symlink to kfmexec
-file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_kfmexec_symlink.cmake "exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${target} \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}/kfmexec\")\n")
-set_target_properties( ${target} PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_kfmexec_symlink.cmake)
+tde_install_symlink( ${target} ${BIN_INSTALL_DIR}/kfmexec )
diff --git a/kio/misc/CMakeLists.txt b/kio/misc/CMakeLists.txt
index 595ac050b..763380167 100644
--- a/kio/misc/CMakeLists.txt
+++ b/kio/misc/CMakeLists.txt
@@ -99,7 +99,4 @@ tde_add_executable( ${target}
DESTINATION ${BIN_INSTALL_DIR}
)
-# FIXME need a review
-# create symlink to fileshare
-file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_filesharelist_symlink.cmake "exec_program(${CMAKE_COMMAND} ARGS -E create_symlink fileshareset \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}/filesharelist\")\n")
-set_target_properties( ktelnetservice PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_filesharelist_symlink.cmake )
+tde_install_symlink( ${target} ${BIN_INSTALL_DIR}/filesharelist )