diff options
| author | Allen Winter <winter@kde.org> | 2007-09-26 14:01:18 +0000 |
|---|---|---|
| committer | Allen Winter <winter@kde.org> | 2007-09-26 14:01:18 +0000 |
| commit | 1deb8975ca3e58dae49b595e25d5f78950bea9d8 (patch) | |
| tree | 613e9c3b10149bc3b572b9856685e5cb22652639 | |
| parent | cdba8640db9ca11cb8b86f727c79f42659fdae53 (diff) | |
| download | extra-cmake-modules-1deb8975ca3e58dae49b595e25d5f78950bea9d8.tar.gz extra-cmake-modules-1deb8975ca3e58dae49b595e25d5f78950bea9d8.tar.bz2 | |
install manpages and infopages into destdir/share
svn path=/trunk/KDE/kdelibs/; revision=717270
| -rw-r--r-- | modules/FindGLIB2.cmake | 2 | ||||
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/FindGLIB2.cmake b/modules/FindGLIB2.cmake index 1f95b3a0..3467562a 100644 --- a/modules/FindGLIB2.cmake +++ b/modules/FindGLIB2.cmake @@ -28,7 +28,7 @@ get_filename_component(glib2LibDir "${GLIB2_LIBRARIES}" PATH) find_path(GLIB2_INTERNAL_INCLUDE_DIR glibconfig.h PATH_SUFFIXES glib-2.0/include - PATHS ${_LibGLIB2IncDir} "${glib2LibDir}" /usr/lib /usr/local/lib) + PATHS ${_LibGLIB2IncDir} "${glib2LibDir}" ${CMAKE_SYSTEM_LIBRARY_PATH}) set(GLIB2_INCLUDE_DIR "${GLIB2_MAIN_INCLUDE_DIR}") diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index b747e258..f68a1ff1 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -555,8 +555,8 @@ _set_fancy(XDG_DIRECTORY_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/desktop-directorie _set_fancy(XDG_MIME_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/mime/packages" "The install dir for the xdg mimetypes") _set_fancy(SYSCONF_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/etc" "The kde sysconfig install dir (default /etc)") -_set_fancy(MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/man" "The kde man install dir (default ${CMAKE_INSTALL_PREFIX}/man/)") -_set_fancy(INFO_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/info" "The kde info install dir (default ${CMAKE_INSTALL_PREFIX}/info)") +_set_fancy(MAN_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/man" "The kde man install dir (default ${SHARE_INSTALL_PREFIX}/man/)") +_set_fancy(INFO_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/info" "The kde info install dir (default ${SHARE_INSTALL_PREFIX}/info)") _set_fancy(DBUS_INTERFACES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/dbus-1/interfaces" "The kde dbus interfaces install dir (default ${SHARE_INSTALL_PREFIX}/dbus-1/interfaces)") _set_fancy(DBUS_SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/dbus-1/services" "The kde dbus services install dir (default ${SHARE_INSTALL_PREFIX}/dbus-1/services)") |