From c534a3ea9502b9e9794f97555c8a8a821b9999e1 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Wed, 12 Jul 2017 10:57:23 -0400 Subject: [PATCH] Move SYSCONFDIR definition to makefile Official autoconf docs contraindicate the use of the $sysconfdir variable in configure.ac. For reference: https://www.gnu.org/software/autoconf/manual/autoconf-2.63/html_node/Installation-Directory-Variables.html The macro SYSCONFDIR (ordinarilly set to "/etc") is required to find a system configuration file installed with i3. In some build setups, this may not be defined properly in when the configure script is compiled. Instead, define this variable in AM_CPPFLAGS as the documentation indicates. fixes #2832 --- Makefile.am | 1 + configure.ac | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0368ecca..188e9e82 100644 --- a/Makefile.am +++ b/Makefile.am @@ -215,6 +215,7 @@ asciidoc_MANS = endif AM_CPPFLAGS = \ + -DSYSCONFDIR="\"$(sysconfdir)\"" \ -I$(top_builddir)/parser \ -I$(top_srcdir)/include \ @AX_EXTEND_SRCDIR_CPPFLAGS@ diff --git a/configure.ac b/configure.ac index 87ffbbe7..f2bf26f8 100644 --- a/configure.ac +++ b/configure.ac @@ -59,8 +59,6 @@ AX_CHECK_ENABLE_DEBUG([yes], , [UNUSED_NDEBUG], [$is_release]) AC_PROG_CC_C99 -AC_DEFINE_UNQUOTED(SYSCONFDIR, "`eval echo $sysconfdir`", [Location of system configuration files]) - # For strnlen() and vasprintf(). AC_USE_SYSTEM_EXTENSIONS -- 2.39.5