awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cmake: cleanup paths variables/fix AWESOME_CONF_PATH

This commit is contained in:
Michael Gehring 2008-06-25 04:00:19 +02:00
parent a786d51a3c
commit 08762261c6
2 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -299,16 +299,16 @@ endif()
# {{{ Installation. # {{{ Installation.
install(TARGETS ${PROJECT_AWE_NAME} ${PROJECT_AWECLIENT_NAME} RUNTIME DESTINATION bin) install(TARGETS ${PROJECT_AWE_NAME} ${PROJECT_AWECLIENT_NAME} RUNTIME DESTINATION bin)
install(FILES ${AWE_LUA_FILES} DESTINATION ${AWESOME_REL_LUA_LIB_PATH}) install(FILES ${AWE_LUA_FILES} DESTINATION ${AWESOME_LUA_LIB_PATH})
install(FILES ${AWE_CONF_FILES} DESTINATION ${AWESOME_REL_CONF_PATH}) install(FILES ${AWE_CONF_FILES} DESTINATION ${AWESOME_CONF_PATH})
if(GENERATE_MANPAGES) if(GENERATE_MANPAGES)
install(FILES ${AWE_MAN1_FILES} DESTINATION ${AWESOME_MAN1_PATH}) install(FILES ${AWE_MAN1_FILES} DESTINATION ${AWESOME_MAN_PATH}/man1)
install(FILES ${AWE_MAN5_FILES} DESTINATION ${AWESOME_MAN5_PATH}) install(FILES ${AWE_MAN5_FILES} DESTINATION ${AWESOME_MAN_PATH}/man5)
endif() endif()
install(DIRECTORY ${AWE_ICON_DIR} DESTINATION ${AWESOME_REL_ICON_PATH}) install(DIRECTORY ${AWE_ICON_DIR} DESTINATION ${AWESOME_DATA_PATH})
install(FILES ${AWE_DOC_FILES} DESTINATION ${AWESOME_REL_DOC_PATH}) install(FILES ${AWE_DOC_FILES} DESTINATION ${AWESOME_DOC_PATH})
if(LUADOC_EXECUTABLE) if(GENERATE_LUADOC)
install(DIRECTORY ${BUILD_DIR}/luadoc DESTINATION ${AWESOME_REL_DOC_PATH}) install(DIRECTORY ${BUILD_DIR}/luadoc DESTINATION ${AWESOME_DOC_PATH})
endif() endif()
# }}} # }}}

18
awesomeConfig.cmake
View File

@ -209,7 +209,7 @@ endif()
if(DEFINED SYSCONFDIR) if(DEFINED SYSCONFDIR)
set(AWESOME_ETC ${SYSCONFDIR}) set(AWESOME_ETC ${SYSCONFDIR})
else() else()
set(AWESOME_ETC etc) set(AWESOME_ETC ${CMAKE_INSTALL_PREFIX}/etc)
endif() endif()
set(AWESOME_VERSION ${VERSION}) set(AWESOME_VERSION ${VERSION})
@ -217,16 +217,12 @@ set(AWESOME_COMPILE_MACHINE ${CMAKE_SYSTEM_PROCESSOR})
set(AWESOME_COMPILE_HOSTNAME ${BUILDHOSTNAME}) set(AWESOME_COMPILE_HOSTNAME ${BUILDHOSTNAME})
set(AWESOME_COMPILE_BY $ENV{USER}) set(AWESOME_COMPILE_BY $ENV{USER})
set(AWESOME_RELEASE ${CODENAME}) set(AWESOME_RELEASE ${CODENAME})
set(AWESOME_SHARE share) 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_DATA_PATH ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_AWE_NAME})
set(AWESOME_ICON_PATH ${CMAKE_INSTALL_PREFIX}/${AWESOME_SHARE}/${PROJECT_AWE_NAME}/icons) set(AWESOME_DOC_PATH ${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_AWE_NAME})
set(AWESOME_CONF_PATH ${CMAKE_INSTALL_PREFIX}/${AWESOME_ETC}/${PROJECT_AWE_NAME}) set(AWESOME_MAN_PATH ${CMAKE_INSTALL_PREFIX}/share/man)
set(AWESOME_MAN1_PATH ${AWESOME_SHARE}/man/man1) set(AWESOME_LUA_LIB_PATH ${AWESOME_DATA_PATH}/lib)
set(AWESOME_MAN5_PATH ${AWESOME_SHARE}/man/man5) set(AWESOME_ICON_PATH ${AWESOME_DATA_PATH}/icons)
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})
set(AWESOME_REL_DOC_PATH ${AWESOME_SHARE}/doc/${PROJECT_AWE_NAME})
# }}} # }}}
# {{{ Configure files. # {{{ Configure files.