diff --git a/CMakeLists.txt b/CMakeLists.txt index 0998f438..c36bc7b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,8 @@ set(AWE_LUA_FILES ${SOURCE_DIR}/lib/tabulous.lua ${SOURCE_DIR}/lib/awful.lua) -set(AWE_CONF_FILES ${BUILD_DIR}/awesomerc.lua) +set(AWE_CONF_FILE_DEFAULT ${BUILD_DIR}/awesomerc.lua) +set(AWE_CONF_FILE rc.lua) set(AWE_ICON_DIR ${SOURCE_DIR}/icons) @@ -346,7 +347,8 @@ endif() # {{{ Installation install(TARGETS ${PROJECT_AWE_NAME} ${PROJECT_AWECLIENT_NAME} RUNTIME DESTINATION bin) install(FILES ${AWE_LUA_FILES} ${AWE_LUAC_FILES} DESTINATION ${AWESOME_LUA_LIB_PATH}) -install(FILES ${AWE_CONF_FILES} DESTINATION ${AWESOME_SYSCONFDIR}) +install(FILES ${AWE_CONF_FILE_DEFAULT} DESTINATION ${AWESOME_SYSCONFDIR} + RENAME ${AWE_CONF_FILE}) if(GENERATE_MANPAGES) install(FILES ${AWE_MAN1_FILES} DESTINATION ${AWESOME_MAN_PATH}/man1) install(FILES ${AWE_MAN5_FILES} DESTINATION ${AWESOME_MAN_PATH}/man5) diff --git a/README b/README index 4b75ec17..c64b29e5 100644 --- a/README +++ b/README @@ -55,5 +55,5 @@ the DISPLAY environment variable is set correctly, e.g.: Configuration ------------- -The configuration of awesome is done by creating a ~/.awesomerc.lua file. +The configuration of awesome is done by creating a $XDG_CONFIG_HOME/awesome/rc.lua file. An example is provided in the sources. diff --git a/awesome.1.txt b/awesome.1.txt index 5e305f17..bd07b116 100644 --- a/awesome.1.txt +++ b/awesome.1.txt @@ -39,7 +39,7 @@ OPTIONS -h | --help:: Print help information, then exit. --config | -c:: - Use an alternate configuration file instead of $HOME/.awesomerc.lua. + Use an alternate configuration file instead of $XDG_CONFIG_HOME/awesome/rc.lua. DEFAULTS MOUSE BINDINGS -----------------------