From cc79b387fc3cc0f074908f626be8a5ae96b6e203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20C=2E=20Morency?= Date: Thu, 19 Jun 2008 17:23:51 -0700 Subject: [PATCH] * Fixed install path Signed-off-by: Julien Danjou --- CMakeLists.txt | 6 +++--- awesomeConfig.cmake | 11 +++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b6df571..43894471 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -121,10 +121,10 @@ IF(AWESOME_GENERATE_MAN) ENDIF() INSTALL(TARGETS ${PROJECT_AWE_NAME} ${PROJECT_AWECLIENT_NAME} RUNTIME DESTINATION bin) -INSTALL(FILES ${AWE_LUA_FILES} DESTINATION ${AWESOME_LUA_LIB_PATH}) -INSTALL(FILES ${AWE_CONF_FILES} DESTINATION ${AWESOME_CONF_PATH}) +INSTALL(FILES ${AWE_LUA_FILES} DESTINATION ${AWESOME_REL_LUA_LIB_PATH}) +INSTALL(FILES ${AWE_CONF_FILES} DESTINATION ${AWESOME_REL_CONF_PATH}) INSTALL(FILES ${AWE_MAN1_NAME} DESTINATION ${AWESOME_MAN1_PATH}) INSTALL(FILES ${AWE_MAN5_NAME} DESTINATION ${AWESOME_MAN5_PATH}) -INSTALL(DIRECTORY ${AWE_ICON_DIR} DESTINATION ${AWESOME_DATA_PATH}) +INSTALL(DIRECTORY ${AWE_ICON_DIR} DESTINATION ${AWESOME_REL_ICON_PATH}) # vim: filetype=cmake:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80 diff --git a/awesomeConfig.cmake b/awesomeConfig.cmake index 7923007f..abb4547e 100644 --- a/awesomeConfig.cmake +++ b/awesomeConfig.cmake @@ -116,12 +116,15 @@ SET(AWESOME_COMPILE_BY $ENV{USER} ) SET(AWESOME_RELEASE ${VERSION} ) SET(AWESOME_ETC etc ) SET(AWESOME_SHARE share ) -SET(AWESOME_DATA_PATH ${AWESOME_SHARE}/${PROJECT_AWE_NAME} ) -SET(AWESOME_LUA_LIB_PATH ${AWESOME_SHARE}/${PROJECT_AWE_NAME}/lib ) -SET(AWESOME_ICON_PATH ${AWESOME_SHARE}/${PROJECT_AWE_NAME}/icons ) -SET(AWESOME_CONF_PATH ${AWESOME_ETC}/${PROJECT_AWE_NAME} ) +SET(AWESOME_LUA_LIB_PATH ${CMAKE_INSTALL_PREFIX}/${AWESOME_SHARE}/${PROJECT_AWE_NAME}/lib ) +SET(AWESOME_ICON_PATH ${CMAKE_INSTALL_PREFIX}/${AWESOME_SHARE}/${PROJECT_AWE_NAME}/icons ) +SET(AWESOME_CONF_PATH ${CMAKE_INSTALL_PREFIX}/${AWESOME_ETC}/${PROJECT_AWE_NAME} ) SET(AWESOME_MAN1_PATH ${AWESOME_SHARE}/man/man1 ) SET(AWESOME_MAN5_PATH ${AWESOME_SHARE}/man/man5 ) +SET(AWESOME_REL_LUA_LIB_PATH ${AWESOME_SHARE}/${PROJECT_AWE_NAME}/lib ) +SET(AWESOME_REL_CONF_PATH ${AWESOME_ETC}/${PROJECT_AWE_NAME} ) +SET(AWESOME_REL_ICON_PATH ${AWESOME_SHARE}/${PROJECT_AWE_NAME} ) + # Configure awesome config.h from template CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in