diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-11-26 17:34:52 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-11-27 10:04:10 +0100 |
| commit | 3e0b590e107add3ab1d1ac23e473fcf0c5fe32b1 (patch) | |
| tree | 4005d99cd7a5bdd7c2763a2d1b07f119c1d0e025 | |
| parent | 09072d0d5e71837ebc6a5b5163b02f8240d56382 (diff) | |
| download | NetworkManager-3e0b590e107add3ab1d1ac23e473fcf0c5fe32b1.tar.gz | |
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
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/settings/plugins/keyfile/utils.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index fd5a47c5a4..3d28b14b9c 100644 --- 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 de538bca47..48795ffb11 100644 --- 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"; |