Merge pull request #2551 from bapt/freebsd_fixes

Freebsd fixes
This commit is contained in:
Michael Stapelberg 2016-11-16 13:48:05 -08:00 committed by GitHub
commit 2ff3d9d651
2 changed files with 2 additions and 2 deletions

View File

@ -71,7 +71,7 @@ char *get_config_path(const char *override_configpath, bool use_system_paths) {
/* 4: check for $XDG_CONFIG_DIRS/i3/config */ /* 4: check for $XDG_CONFIG_DIRS/i3/config */
if ((xdg_config_dirs = getenv("XDG_CONFIG_DIRS")) == NULL) 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 *buf = sstrdup(xdg_config_dirs);
char *tok = strtok(buf, ":"); char *tok = strtok(buf, ":");

View File

@ -74,7 +74,7 @@
AC_DEFUN([AX_EXTEND_SRCDIR], AC_DEFUN([AX_EXTEND_SRCDIR],
[dnl [dnl
AS_CASE([$srcdir], AS_CASE([$srcdir],
[.|.*], [.|.*|/*],
[ [
# pwd -P is specified in IEEE 1003.1 from 2004 # pwd -P is specified in IEEE 1003.1 from 2004
as_dir=`cd "$srcdir" && pwd -P` as_dir=`cd "$srcdir" && pwd -P`