nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Tony Crisci 2017-07-12 10:57:23 -04:00
parent bf1e4339e6
commit c534a3ea95
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -215,6 +215,7 @@ asciidoc_MANS =
endif endif
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DSYSCONFDIR="\"$(sysconfdir)\"" \
-I$(top_builddir)/parser \ -I$(top_builddir)/parser \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
@AX_EXTEND_SRCDIR_CPPFLAGS@ @AX_EXTEND_SRCDIR_CPPFLAGS@

2
configure.ac
View File

@ -59,8 +59,6 @@ AX_CHECK_ENABLE_DEBUG([yes], , [UNUSED_NDEBUG], [$is_release])
AC_PROG_CC_C99 AC_PROG_CC_C99
AC_DEFINE_UNQUOTED(SYSCONFDIR, "`eval echo $sysconfdir`", [Location of system configuration files])
# For strnlen() and vasprintf(). # For strnlen() and vasprintf().
AC_USE_SYSTEM_EXTENSIONS AC_USE_SYSTEM_EXTENSIONS