From 6fc617c65238243241f3765b9e8ead3af58fb5ad Mon Sep 17 00:00:00 2001 From: Jason Ish Date: Tue, 18 Feb 2025 15:15:43 -0600 Subject: [PATCH] build: use expanded localstatedir for #define Use the expanded form of localstatedir in autoconf.h instead of the unexpanded one, the difference being: #define LOCAL_STATE_DIR "${prefix}/var" and #define LOCAL_STATE_DIR "/usr/local/var" assuming default ./configure arguments. Fixes commit b6a610df2669336756c67f77eb857b190b77770a. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 9b4db2ba1f..1f989f3eac 100644 --- a/configure.ac +++ b/configure.ac @@ -2508,7 +2508,6 @@ AC_SUBST(e_logcertsdir) AC_SUBST(e_sysconfdir) AC_DEFINE_UNQUOTED([CONFIG_DIR],["$e_sysconfdir"],[Our CONFIG_DIR]) AC_SUBST(e_localstatedir) -AC_DEFINE_UNQUOTED([LOCAL_STATE_DIR],["$localstatedir"],[Our LOCAL_STATE_DIR]) AC_SUBST(e_datadir) AC_DEFINE_UNQUOTED([DATA_DIR],["$e_datadir"],[Our DATA_DIR]) AC_SUBST(e_magic_file) @@ -2525,6 +2524,7 @@ EXPAND_VARIABLE(datadir, CONFIGURE_DATAROOTDIR) AC_SUBST(CONFIGURE_PREFIX) AC_SUBST(CONFIGURE_SYSCONDIR) AC_SUBST(CONFIGURE_LOCALSTATEDIR) +AC_DEFINE_UNQUOTED([LOCAL_STATE_DIR],["$CONFIGURE_LOCALSTATEDIR"],[Our LOCAL_STATE_DIR]) AC_SUBST(CONFIGURE_DATAROOTDIR) AC_SUBST(PACKAGE_VERSION) AC_SUBST(MAJOR_MINOR) -- 2.47.2