networkd: Set configuration path from build scripts

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 1b18f62bbf99286818a63195ca08decc913d815b..3cc7ce940ab3a723b9370d4fef7841f68cd48b0c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -315,7 +315,8 @@ dist_networkd_SOURCES = \
        src/networkd/string.h
 
 networkd_CPPFLAGS = \
-       $(AM_CPPFLAGS)
+       $(AM_CPPFLAGS) \
+       -DCONFIG_DIR="\"$(configdir)\""
 
 networkd_CFLAGS = \
        $(AM_CFLAGS) \

diff --git a/src/networkd/daemon.c b/src/networkd/daemon.c
index bd5f1f0031121c4acaaee3c84abc96adbddbaafe..9077c545e5079a77c2ad408cb0d8f25aecd78ab3 100644 (file)
--- a/src/networkd/daemon.c
+++ b/src/networkd/daemon.c
@@ -109,7 +109,7 @@ static int nw_daemon_setup(struct nw_daemon* daemon) {
        int r;
 
        // Read configuration file
-       r = nw_config_read(&daemon->config, "/etc/network/settings");
+       r = nw_config_read(&daemon->config, CONFIG_DIR "/settings");
        if (r)
                return r;