Index: dnssd/CMakeLists.txt
===================================================================
--- dnssd/CMakeLists.txt	(revision 684967)
+++ dnssd/CMakeLists.txt	(working copy)
@@ -63,9 +63,12 @@
 endif (HAVE_DNSSD)
 
 set_target_properties(kdnssd PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS kdnssd  DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS kdnssd
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
-
 ########### install files ###############
 install( FILES dnssd_export.h domainbrowser.h remoteservice.h servicetypebrowser.h  publicservice.h servicebase.h servicebrowser.h ${CMAKE_CURRENT_BINARY_DIR}/settings.h  DESTINATION  ${INCLUDE_INSTALL_DIR}/dnssd )
 
Index: interfaces/kimproxy/library/CMakeLists.txt
===================================================================
--- interfaces/kimproxy/library/CMakeLists.txt	(revision 684967)
+++ interfaces/kimproxy/library/CMakeLists.txt	(working copy)
@@ -23,5 +23,9 @@
 
 ########### install files ###############
 
-install(TARGETS kimproxy  DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS kimproxy
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 install( FILES kimproxy_export.h kimproxy.h DESTINATION  ${INCLUDE_INSTALL_DIR} )
Index: interfaces/kmediaplayer/CMakeLists.txt
===================================================================
--- interfaces/kmediaplayer/CMakeLists.txt	(revision 684967)
+++ interfaces/kmediaplayer/CMakeLists.txt	(working copy)
@@ -18,7 +18,11 @@
 target_link_libraries(kmediaplayer  ${KDE4_KPARTS_LIBS} )
 
 set_target_properties(kmediaplayer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS kmediaplayer  DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS kmediaplayer
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
 
 ########### install files ###############
Index: interfaces/ktexteditor/CMakeLists.txt
===================================================================
--- interfaces/ktexteditor/CMakeLists.txt	(revision 684967)
+++ interfaces/ktexteditor/CMakeLists.txt	(working copy)
@@ -28,9 +28,12 @@
 target_link_libraries(ktexteditor  ${KDE4_KDECORE_LIBS} ${QT_QTDBUS_LIBRARY} kparts )
 
 set_target_properties(ktexteditor PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS ktexteditor  DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS ktexteditor
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
-
 ########### install files ###############
 install( FILES
     ktexteditor_export.h
Index: kconf_update/CMakeLists.txt
===================================================================
--- kconf_update/CMakeLists.txt	(revision 684967)
+++ kconf_update/CMakeLists.txt	(working copy)
@@ -14,7 +14,11 @@
 
 target_link_libraries(kdeinit_kconf_update  ${KDE4_KDECORE_LIBS} )
 
-install(TARGETS kdeinit_kconf_update  DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS kdeinit_kconf_update
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
 target_link_libraries( kconf_update kdeinit_kconf_update )
 install(TARGETS kconf_update DESTINATION ${LIBEXEC_INSTALL_DIR} )
Index: kde3support/CMakeLists.txt
===================================================================
--- kde3support/CMakeLists.txt	(revision 684967)
+++ kde3support/CMakeLists.txt	(working copy)
@@ -65,9 +65,12 @@
 target_link_libraries(kde3support  ${KDE4_KPARTS_LIBS}  ${QT_QTXML_LIBRARY} ${QT_QT3SUPPORT_LIBRARY})
 
 set_target_properties(kde3support PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS kde3support  DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS kde3support
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
-
 ########### install files ###############
 
 install( FILES
Index: kdecore/CMakeLists.txt
===================================================================
--- kdecore/CMakeLists.txt	(revision 684967)
+++ kdecore/CMakeLists.txt	(working copy)
@@ -227,9 +227,11 @@
 target_link_libraries(kdecore ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${UTIL_LIBRARY} ${ZLIB_LIBRARY} ${kdecore_OPTIONAL_LIBS})
 
 set_target_properties(kdecore PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS kdecore DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS kdecore
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR} )
 
-
 ########### next target ###############
 
 configure_file(all_languages.desktop ${CMAKE_CURRENT_BINARY_DIR}/all_languages @ONLY)  
@@ -265,9 +267,9 @@
 
 
 if(KDE4_ENABLE_FINAL)
-	macro_add_file_dependencies(                                                                                                    ${CMAKE_CURRENT_BINARY_DIR}/ktranscript_final_cpp.cpp                                                                        ${CMAKE_CURRENT_BINARY_DIR}/ktranscript.lut.h)
+	macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/ktranscript_final_cpp.cpp ${CMAKE_CURRENT_BINARY_DIR}/ktranscript.lut.h )
 else(KDE4_ENABLE_FINAL)
-	macro_add_file_dependencies(                                                                                                    ${CMAKE_CURRENT_SOURCE_DIR}/localization/ktranscript.cpp                                                                     ${CMAKE_CURRENT_BINARY_DIR}/ktranscript.lut.h)
+	macro_add_file_dependencies( ${CMAKE_CURRENT_SOURCE_DIR}/localization/ktranscript.cpp ${CMAKE_CURRENT_BINARY_DIR}/ktranscript.lut.h )
 endif(KDE4_ENABLE_FINAL)
 
 install( TARGETS ktranscript DESTINATION ${PLUGIN_INSTALL_DIR} )
Index: kded/CMakeLists.txt
===================================================================
--- kded/CMakeLists.txt	(revision 684967)
+++ kded/CMakeLists.txt	(working copy)
@@ -17,7 +17,11 @@
 
 target_link_libraries(kdeinit_kded4  ${KDE4_KIO_LIBS} )
 
-install(TARGETS kdeinit_kded4  DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS kdeinit_kded4
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
 target_link_libraries( kded4 kdeinit_kded4 )
 install(TARGETS kded4 DESTINATION ${BIN_INSTALL_DIR} )
@@ -45,7 +49,11 @@
 # needs kio for KServiceGroup
 target_link_libraries(kdeinit_kbuildsycoca4  ${KDE4_KIO_LIBS} )
 
-install(TARGETS kdeinit_kbuildsycoca4  DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS kdeinit_kbuildsycoca4
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
 target_link_libraries( kbuildsycoca4 kdeinit_kbuildsycoca4 )
 install(TARGETS kbuildsycoca4 DESTINATION ${BIN_INSTALL_DIR} )
Index: kdefx/CMakeLists.txt
===================================================================
--- kdefx/CMakeLists.txt	(revision 684967)
+++ kdefx/CMakeLists.txt	(working copy)
@@ -25,9 +25,12 @@
 target_link_libraries(kdefx ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} )
 
 set_target_properties(kdefx PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS kdefx  DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS kdefx
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
-
 ########### install files ###############
 install( FILES kdefx_export.h kpixmapsplitter.h  kpixmapeffect.h kimageeffect.h kdrawutil.h kstyle.h kcpuinfo.h  DESTINATION  ${INCLUDE_INSTALL_DIR} )
 
Index: kdeprint/CMakeLists.txt
===================================================================
--- kdeprint/CMakeLists.txt	(revision 684967)
+++ kdeprint/CMakeLists.txt	(working copy)
@@ -120,9 +120,12 @@
 target_link_libraries(kdeprint  ${KDE4_KDECORE_LIBS} kparts )
 
 set_target_properties(kdeprint PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS kdeprint  DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS kdeprint
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
-
 ########### install files ###############
 
 install( FILES testprint.ps specials.desktop  DESTINATION  ${DATA_INSTALL_DIR}/kdeprint )
Index: kdeui/CMakeLists.txt
===================================================================
--- kdeui/CMakeLists.txt	(revision 684967)
+++ kdeui/CMakeLists.txt	(working copy)
@@ -276,9 +276,11 @@
 endif(X11_XTest_FOUND)
 
 set_target_properties(kdeui PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS kdeui  DESTINATION ${LIB_INSTALL_DIR} )
-
-
+install(TARGETS kdeui
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 ########### install files ###############
 
 install( FILES dialogs/aboutkde.png dialogs/ktip-bulb.png dialogs/ktip-background.png  DESTINATION  ${DATA_INSTALL_DIR}/kdeui/pics )
Index: kfile/CMakeLists.txt
===================================================================
--- kfile/CMakeLists.txt	(revision 684967)
+++ kfile/CMakeLists.txt	(working copy)
@@ -43,7 +43,11 @@
 kde4_add_library(kfile SHARED ${kfile_LIB_SRCS})
 target_link_libraries(kfile ${KDE4_KIO_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${ZLIB_LIBRARY} ${STRIGI_LIBRARIES} ${KDE4_SOLID_LIBS})
 set_target_properties(kfile PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS kfile  DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS kfile
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
 install( FILES
   k3mimetyperesolver.h
Index: khtml/CMakeLists.txt
===================================================================
--- khtml/CMakeLists.txt	(revision 684967)
+++ khtml/CMakeLists.txt	(working copy)
@@ -327,9 +327,12 @@
 target_link_libraries(khtml ${KDE4_KPARTS_LIBS} ktexteditor kdeprint kde3support kjs ${KDE4_PHONON_LIBS} ${JPEG_LIBRARIES} ${GIF_LIBRARIES} ${PNG_LIBRARIES} )
 
 set_target_properties(khtml PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS khtml  DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS khtml
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
-
 ########### khtmlpart ###############
 
 set(khtmlpart_PART_SRCS khtml_factory_init.cpp )
Index: kinit/CMakeLists.txt
===================================================================
--- kinit/CMakeLists.txt	(revision 684967)
+++ kinit/CMakeLists.txt	(working copy)
@@ -125,7 +125,11 @@
 
 target_link_libraries(kdeinit_klauncher  ${KDE4_KIO_LIBS} )
 
-install(TARGETS kdeinit_klauncher  DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS kdeinit_klauncher
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
 target_link_libraries( klauncher kdeinit_klauncher )
 install(TARGETS klauncher DESTINATION ${LIBEXEC_INSTALL_DIR} )
Index: kio/CMakeLists.txt
===================================================================
--- kio/CMakeLists.txt	(revision 686634)
+++ kio/CMakeLists.txt	(working copy)
@@ -243,7 +243,11 @@
 set_target_properties(kio PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
 
 ########### install files ###############
-install(TARGETS kio  DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS kio
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
 install( PROGRAMS useragent.pl proxytype.pl  DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
 
Index: kio/misc/kntlm/CMakeLists.txt
===================================================================
--- kio/misc/kntlm/CMakeLists.txt	(revision 686634)
+++ kio/misc/kntlm/CMakeLists.txt	(working copy)
@@ -9,9 +9,12 @@
 target_link_libraries(kntlm  ${KDE4_KDECORE_LIBS} )
 
 set_target_properties(kntlm PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS kntlm  DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS kntlm
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
-
 ########### install files ###############
 install( FILES kntlm_export.h kntlm.h  DESTINATION  ${INCLUDE_INSTALL_DIR}/kio )
 
Index: kioslave/http/CMakeLists.txt
===================================================================
--- kioslave/http/CMakeLists.txt	(revision 686639)
+++ kioslave/http/CMakeLists.txt	(working copy)
@@ -38,7 +38,11 @@
 
 target_link_libraries(kdeinit_kio_http_cache_cleaner  ${KDE4_KIO_LIBS} )
 
-install(TARGETS kdeinit_kio_http_cache_cleaner  DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS kdeinit_kio_http_cache_cleaner
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
 target_link_libraries( kio_http_cache_cleaner kdeinit_kio_http_cache_cleaner )
 install(TARGETS kio_http_cache_cleaner DESTINATION ${LIBEXEC_INSTALL_DIR} )
Index: kjs/CMakeLists.txt
===================================================================
--- kjs/CMakeLists.txt	(revision 686553)
+++ kjs/CMakeLists.txt	(working copy)
@@ -142,7 +142,11 @@
 endif(PCRE_FOUND)
 
 set_target_properties(${KJSLIBNAME} PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS ${KJSLIBNAME}  DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS ${KJSLIBNAME}
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
 ########### js - basic shell ###############
 
Index: kjsembed/kjsembed/CMakeLists.txt
===================================================================
--- kjsembed/kjsembed/CMakeLists.txt	(revision 685837)
+++ kjsembed/kjsembed/CMakeLists.txt	(working copy)
@@ -73,7 +73,11 @@
 target_link_libraries(${KJSEMBEDLIBNAME} ${KDE4_KDECORE_LIBS} ${QT_QTUITOOLS_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTSVG_LIBRARY} ${QT_QTXML_LIBRARY} ${KJSLIBNAME} )
 
 set_target_properties(${KJSEMBEDLIBNAME} PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS ${KJSEMBEDLIBNAME}  DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS ${KJSEMBEDLIBNAME}
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
 
 ########### install files ###############
Index: knewstuff/knewstuff2/CMakeLists.txt
===================================================================
--- knewstuff/knewstuff2/CMakeLists.txt	(revision 684967)
+++ knewstuff/knewstuff2/CMakeLists.txt	(working copy)
@@ -57,7 +57,11 @@
 
 target_link_libraries(knewstuff2 ${KDE4_KIO_LIBS} ${KDE4_KHTML_LIBS} ${QT_QTNETWORK_LIBRARY})
 set_target_properties(knewstuff2 PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
-install(TARGETS knewstuff2 DESTINATION ${LIB_INSTALL_DIR})
+install(TARGETS knewstuff2
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
 install(FILES
   core/author.h
Index: knotify/config/CMakeLists.txt
===================================================================
--- knotify/config/CMakeLists.txt	(revision 684967)
+++ knotify/config/CMakeLists.txt	(working copy)
@@ -22,9 +22,12 @@
 target_link_libraries(knotifyconfig  ${KDE4_KIO_LIBS} )
 
 set_target_properties(knotifyconfig PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS knotifyconfig  DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS knotifyconfig
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
-
 ########### install files ###############
 install( FILES knotifyconfig_export.h knotifyconfigwidget.h  DESTINATION  ${INCLUDE_INSTALL_DIR} )
 
Index: kparts/CMakeLists.txt
===================================================================
--- kparts/CMakeLists.txt	(revision 684967)
+++ kparts/CMakeLists.txt	(working copy)
@@ -28,9 +28,12 @@
 target_link_libraries(kparts  ${KDE4_KDECORE_LIBS} kdeui kio)
 
 set_target_properties(kparts PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS kparts  DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS kparts
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
-
 ########### install files ###############
 
 install( FILES kpart.desktop krop.desktop krwp.desktop browserview.desktop   DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
Index: kross/core/CMakeLists.txt
===================================================================
--- kross/core/CMakeLists.txt	(revision 684967)
+++ kross/core/CMakeLists.txt	(working copy)
@@ -13,7 +13,11 @@
 kde4_add_library(krosscore SHARED ${krosscore_LIB_SRCS})
 target_link_libraries(krosscore ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS})
 set_target_properties(krosscore PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
-install(TARGETS krosscore DESTINATION ${LIB_INSTALL_DIR})
+install(TARGETS krosscore
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
 install(FILES
     kross_export.h
Index: kross/ui/CMakeLists.txt
===================================================================
--- kross/ui/CMakeLists.txt	(revision 684967)
+++ kross/ui/CMakeLists.txt	(working copy)
@@ -17,7 +17,11 @@
 kde4_add_library(krossui SHARED ${krossui_LIB_SRCS})
 target_link_libraries(krossui krosscore ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS})
 set_target_properties(krossui PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
-install(TARGETS krossui DESTINATION ${LIB_INSTALL_DIR})
+install(TARGETS krossui
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
 ########### install files ###############
 
Index: kutils/CMakeLists.txt
===================================================================
--- kutils/CMakeLists.txt	(revision 684967)
+++ kutils/CMakeLists.txt	(working copy)
@@ -36,9 +36,12 @@
 target_link_libraries(kutils  ${KDE4_KDECORE_LIBS} kdeui kio)
 
 set_target_properties(kutils PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS kutils  DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS kutils
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
-
 ########### install files ###############
 
 install( FILES
Index: kwallet/backend/CMakeLists.txt
===================================================================
--- kwallet/backend/CMakeLists.txt	(revision 684967)
+++ kwallet/backend/CMakeLists.txt	(working copy)
@@ -18,7 +18,10 @@
 target_link_libraries(kwalletbackend ${KDE4_KDEUI_LIBS} )
 
 set_target_properties(kwalletbackend PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS kwalletbackend  DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS kwalletbackend
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
-
 ########### install files ###############
Index: nepomuk/core/CMakeLists.txt
===================================================================
--- nepomuk/core/CMakeLists.txt	(revision 684967)
+++ nepomuk/core/CMakeLists.txt	(working copy)
@@ -61,7 +61,11 @@
 
 set_target_properties(nepomuk PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
 
-install(TARGETS nepomuk DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS nepomuk
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 install(FILES
   variant.h
   resourcemanager.h
Index: nepomuk/middleware/CMakeLists.txt
===================================================================
--- nepomuk/middleware/CMakeLists.txt	(revision 684967)
+++ nepomuk/middleware/CMakeLists.txt	(working copy)
@@ -45,7 +45,11 @@
 
 set_target_properties(nepomuk-middleware PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
 
-install(TARGETS nepomuk-middleware DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS nepomuk-middleware
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 install(FILES
   registry.h
   service.h
Index: phonon/CMakeLists.txt
===================================================================
--- phonon/CMakeLists.txt	(revision 687090)
+++ phonon/CMakeLists.txt	(working copy)
@@ -55,9 +55,12 @@
 kde4_add_library(phonon SHARED ${phonon_LIB_SRCS})
 target_link_libraries(phonon ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
 set_target_properties(phonon PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS phonon  DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS phonon
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
-
 ########### install files ###############
 
 install( FILES
Index: phonon/experimental/CMakeLists.txt
===================================================================
--- phonon/experimental/CMakeLists.txt	(revision 687090)
+++ phonon/experimental/CMakeLists.txt	(working copy)
@@ -13,7 +13,11 @@
 kde4_add_library(phononexperimental SHARED ${phononexperimental_LIB_SRCS})
 target_link_libraries(phononexperimental ${KDE4_PHONON_LIBS})
 set_target_properties(phononexperimental PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
-install(TARGETS phononexperimental DESTINATION ${LIB_INSTALL_DIR})
+install(TARGETS phononexperimental
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
 ########### install headers ###############
 install(FILES
Index: phonon/libkaudiodevicelist/CMakeLists.txt
===================================================================
--- phonon/libkaudiodevicelist/CMakeLists.txt	(revision 687090)
+++ phonon/libkaudiodevicelist/CMakeLists.txt	(working copy)
@@ -24,7 +24,11 @@
 
 set_target_properties(kaudiodevicelist PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
 
-install(TARGETS kaudiodevicelist DESTINATION ${LIB_INSTALL_DIR})
+install(TARGETS kaudiodevicelist
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 install(FILES
 	kaudiodevicelist_export.h
 	audiodevice.h
Index: solid/solid/CMakeLists.txt
===================================================================
--- solid/solid/CMakeLists.txt	(revision 687097)
+++ solid/solid/CMakeLists.txt	(working copy)
@@ -113,7 +113,11 @@
 target_link_libraries(solid ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY})
 
 set_target_properties(solid PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS solid DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS solid
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
 install(FILES org.kde.Solid.Networking.Client.xml DESTINATION ${DBUS_INTERFACES_DIR})
 
Index: threadweaver/Weaver/CMakeLists.txt
===================================================================
--- threadweaver/Weaver/CMakeLists.txt	(revision 684967)
+++ threadweaver/Weaver/CMakeLists.txt	(working copy)
@@ -34,7 +34,11 @@
 kde4_add_library(threadweaver SHARED ${ThreadWeaver_LIB_SRCS})
 target_link_libraries(threadweaver ${QT_QTCORE_LIBRARY})
 set_target_properties(threadweaver PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
-install(TARGETS threadweaver DESTINATION ${LIB_INSTALL_DIR})
+install(TARGETS threadweaver
+             RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+             ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
 install(FILES
     WeaverInterface.h
