build: Remove NM_CONFIG_KEYFILE_PATH_DEFAULT from config.h

Can't just substitute sysconfdir into a header file -- it's meant to be
expanded in a Makefile. Otherwise, unexpanded ${prefix} will end up in a
header file.

We do that for NMCONFDIR already, let's use it here too.

Fixes: 2144457fab9138c9f5ddac9759f48e2a8735dcfb

diff --git a/configure.ac b/configure.ac
index fd5a47c..3d28b14 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -138,9 +138,6 @@ if test "$enable_ifcfg_rh" = "yes"; then
 fi
 AC_SUBST(DISTRO_NETWORK_SERVICE)
 
-AC_SUBST(NM_CONFIG_KEYFILE_PATH_DEFAULT, "${sysconfdir}/$PACKAGE/system-connections", [The keyfile directory])
-AC_DEFINE_UNQUOTED(NM_CONFIG_KEYFILE_PATH_DEFAULT, "$NM_CONFIG_KEYFILE_PATH_DEFAULT", [The keyfile directory])
-
 # Code coverage
 GNOME_CODE_COVERAGE
 

diff --git a/src/settings/plugins/keyfile/utils.c b/src/settings/plugins/keyfile/utils.c
index de538bc..48795ff 100644 (file)
--- a/src/settings/plugins/keyfile/utils.c
+++ b/src/settings/plugins/keyfile/utils.c
@@ -29,6 +29,8 @@
 #include <nm-setting-wireless-security.h>
 #include "nm-config.h"
 
+#define NM_CONFIG_KEYFILE_PATH_DEFAULT NMCONFDIR "/system-connections"
+
 static const char temp_letters[] =
 "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";