* Fixed merge problem

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Félix C. Morency 2008-06-19 16:22:14 -07:00 committed by Julien Danjou
parent 45ba24676b
commit 11cdef7839
1 changed files with 0 additions and 3 deletions

View File

@ -133,9 +133,6 @@ SET( AWESOME_ICON_PATH ${AWESOME_SHARE}/${PROJECT_AWE_NAME}/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 )
SET( AWESOME_LUA_LIB_PATH ${CMAKE_INSTALL_PREFIX}/${AWESOME_DATA_PATH}/lib )
SET( AWESOME_ICON_PATH ${CMAKE_INSTALL_PREFIX}/${AWESOME_DATA_PATH}/icons )
SET( AWESOME_CONF_PATH ${CMAKE_INSTALL_PREFIX}/${AWESOME_ETC}/${PROJECT_AWE_NAME} )
# Configure awesome config.h from template
CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in