From 34a5a75860ed31ec0c2f190198e39787d3ec12c2 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Thu, 19 Jun 2008 14:25:34 +0200 Subject: [PATCH] cmake: fix icon install path --- CMakeLists.txt | 6 +++--- awesomeConfig.cmake | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 84e89a39..7d6e7c7e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ SET( AWE_LUA_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tabulous.lua SET( AWE_CONF_FILES ${CMAKE_CURRENT_SOURCE_DIR}/awesomerc.lua ) -SET( AWE_ICON_PATH ${CMAKE_CURRENT_SOURCE_DIR}/icons ) +SET( AWE_ICON_DIR ${CMAKE_CURRENT_SOURCE_DIR}/icons ) SET( AWE_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/awesome.c ${CMAKE_CURRENT_SOURCE_DIR}/client.c @@ -157,7 +157,7 @@ INSTALL( FILES ${AWE_MAN5_NAME} DESTINATION ${AWESOME_MAN5_PATH} ) -INSTALL( DIRECTORY ${AWE_ICON_PATH} - DESTINATION ${AWESOME_ICON_PATH} +INSTALL( DIRECTORY ${AWE_ICON_DIR} + DESTINATION ${AWESOME_DATA_PATH} ) diff --git a/awesomeConfig.cmake b/awesomeConfig.cmake index 7a602cbc..47a91bf8 100644 --- a/awesomeConfig.cmake +++ b/awesomeConfig.cmake @@ -117,8 +117,9 @@ SET( AWESOME_COMPILE_BY $ENV{USER} ) SET( AWESOME_RELEASE ${VERSION} ) SET( AWESOME_ETC ${CMAKE_INSTALL_PREFIX}/etc ) SET( AWESOME_SHARE ${CMAKE_INSTALL_PREFIX}/share ) -SET( AWESOME_LUA_LIB_PATH ${AWESOME_SHARE}/${PROJECT_AWE_NAME}/lib ) -SET( AWESOME_ICON_PATH ${AWESOME_SHARE}/${PROJECT_AWE_NAME}/icons ) +SET( AWESOME_DATA_PATH ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_AWE_NAME} ) +SET( AWESOME_LUA_LIB_PATH ${AWESOME_DATA_PATH}/lib ) +SET( AWESOME_ICON_PATH ${AWESOME_DATA_PATH}/icons ) SET( AWESOME_CONF_PATH ${AWESOME_ETC}/${PROJECT_AWE_NAME} ) SET( AWESOME_MAN1_PATH ${AWESOME_SHARE}/man/man1 ) SET( AWESOME_MAN5_PATH ${AWESOME_SHARE}/man/man5 )