Merge pull request #2551 from bapt/freebsd_fixes

Freebsd fixes

diff --git a/libi3/get_config_path.c b/libi3/get_config_path.c
index c47e6dd8b56775df0039621079c96db43d4a14ad..efece5cde792f44949423897983445a033865dd1 100644 (file)
--- 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, ":");

diff --git a/m4/ax_extend_srcdir.m4 b/m4/ax_extend_srcdir.m4
index a308d67df1d1b46c89258d4b3e7777c3fe8f53a4..40f37878544ebf9ea062fb2b39cbe42d1592c7ad 100644 (file)
--- 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`