From 40fe6a00b6dde631a68e40731fabb71680a5454c Mon Sep 17 00:00:00 2001 From: samelian Date: Sun, 24 Oct 2010 21:53:26 +0000 Subject: [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 --- pics/CMakeLists.txt | 2 +- pics/crystalsvg/CMakeLists.txt | 2 +- pics/emoticons/CMakeLists.txt | 2 +- pics/hicolor/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pics') diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt index 5aacdb482..e8955da34 100644 --- a/pics/CMakeLists.txt +++ b/pics/CMakeLists.txt @@ -37,7 +37,7 @@ link_directories( ##### other data ################################ -tde_install_symlink( crystalsvg ${SHARE_INSTALL_DIR}/icons/default.kde ) +tde_install_symlink( crystalsvg ${ICON_INSTALL_DIR}/default.kde ) ##### ksvgtopng ################################# diff --git a/pics/crystalsvg/CMakeLists.txt b/pics/crystalsvg/CMakeLists.txt index 04c9d81fc..9db5eada7 100644 --- a/pics/crystalsvg/CMakeLists.txt +++ b/pics/crystalsvg/CMakeLists.txt @@ -11,5 +11,5 @@ # FIXME generating png icons are not implemented -install( FILES index.theme DESTINATION ${ICONS_INSTALL_DIR}/crystalsvg ) +install( FILES index.theme DESTINATION ${ICON_INSTALL_DIR}/crystalsvg ) tde_install_icons( ) diff --git a/pics/emoticons/CMakeLists.txt b/pics/emoticons/CMakeLists.txt index 6dbb77b23..86d7adb18 100644 --- a/pics/emoticons/CMakeLists.txt +++ b/pics/emoticons/CMakeLists.txt @@ -21,4 +21,4 @@ install( FILES teeth.png thumbs_down.png thumbs_up.png tongue.png unhappy.png unlove.png wilted_rose.png wink.png foot_in_mouth.png innocent.png undecided.png - DESTINATION ${SHARE_INSTALL_DIR}/emoticons/Default ) + DESTINATION ${SHARE_INSTALL_PREFIX}/emoticons/Default ) diff --git a/pics/hicolor/CMakeLists.txt b/pics/hicolor/CMakeLists.txt index 5998fe2a8..79a569a66 100644 --- a/pics/hicolor/CMakeLists.txt +++ b/pics/hicolor/CMakeLists.txt @@ -9,4 +9,4 @@ # ################################################# -install( FILES index.theme DESTINATION ${ICONS_INSTALL_DIR}/hicolor ) +install( FILES index.theme DESTINATION ${ICON_INSTALL_DIR}/hicolor ) -- cgit v1.2.1