Merge branch 'find-fallback-config' of https://github.com/psychon/awesome

CMakeLists.txt

@@ -24,9 +24,6 @@ include_directories(
 
 set(CHECK_TARGETS check-integration)
 
-set(AWE_CONF_FILE_DEFAULT ${BUILD_DIR}/awesomerc.lua)
-set(AWE_CONF_FILE rc.lua)
-
 set(AWE_ICON_DIR ${SOURCE_DIR}/icons)
 set(AWE_THEMES_DIR ${SOURCE_DIR}/themes)
 
@@ -354,8 +351,8 @@ install(TARGETS ${PROJECT_AWE_NAME} RUNTIME DESTINATION bin)
 install(FILES "utils/awesome-client" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(DIRECTORY ${BUILD_DIR}/lib DESTINATION ${AWESOME_DATA_PATH}
     PATTERN "*.in" EXCLUDE)
-install(FILES ${AWE_CONF_FILE_DEFAULT} DESTINATION ${AWESOME_SYSCONFDIR}
-        RENAME ${AWE_CONF_FILE})
+install(FILES ${BUILD_DIR}/awesomerc.lua DESTINATION ${AWESOME_SYSCONFDIR}
+        RENAME rc.lua)
 if(GENERATE_MANPAGES)
     if(COMPRESS_MANPAGES)
         set(regex "\\.(xml|txt|[0-9])$")

config.h

@@ -6,6 +6,7 @@
 #define AWESOME_IS_BIG_ENDIAN @AWESOME_IS_BIG_ENDIAN@
 #define AWESOME_THEMES_PATH   "@AWESOME_THEMES_PATH@"
 #define AWESOME_ICON_PATH     "@AWESOME_ICON_PATH@"
+#define AWESOME_DEFAULT_CONF  "@AWESOME_SYSCONFDIR@/rc.lua"
 
 #cmakedefine WITH_DBUS
 #cmakedefine HAS_EXECINFO

luaa.c

@@ -907,8 +907,13 @@ luaA_find_config(xdgHandle* xdg, const char *confpatharg, luaA_config_callback *
         }
         tmp += a_strlen(tmp) + 1;
     }
-
     p_delete(&confpath);
+
+    if(callback(AWESOME_DEFAULT_CONF))
+    {
+        return a_strdup(AWESOME_DEFAULT_CONF);
+    }
+
     return NULL;
 }