From c602ec7cc2203c03c62439bb3f35a3acfe9e2ed8 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Wed, 9 Nov 2016 22:34:39 +0100 Subject: [PATCH 1/2] Respect SYSCONFDIR when looking for defaut 'xdg' directory --- libi3/get_config_path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libi3/get_config_path.c b/libi3/get_config_path.c index c47e6dd8..efece5cd 100644 --- a/libi3/get_config_path.c +++ b/libi3/get_config_path.c @@ -71,7 +71,7 @@ char *get_config_path(const char *override_configpath, bool use_system_paths) { /* 4: check for $XDG_CONFIG_DIRS/i3/config */ if ((xdg_config_dirs = getenv("XDG_CONFIG_DIRS")) == NULL) - xdg_config_dirs = "/etc/xdg"; + xdg_config_dirs = SYSCONFDIR "/xdg"; char *buf = sstrdup(xdg_config_dirs); char *tok = strtok(buf, ":"); From b494d27848beb166fae6503813ed1593f02e6f1e Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Wed, 9 Nov 2016 22:37:21 +0100 Subject: [PATCH 2/2] Accept calling absolute path when building outsource --- m4/ax_extend_srcdir.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/ax_extend_srcdir.m4 b/m4/ax_extend_srcdir.m4 index a308d67d..40f37878 100644 --- a/m4/ax_extend_srcdir.m4 +++ b/m4/ax_extend_srcdir.m4 @@ -74,7 +74,7 @@ AC_DEFUN([AX_EXTEND_SRCDIR], [dnl AS_CASE([$srcdir], - [.|.*], + [.|.*|/*], [ # pwd -P is specified in IEEE 1003.1 from 2004 as_dir=`cd "$srcdir" && pwd -P`