diff options
| author | Pavel Šimerda <psimerda@redhat.com> | 2012-08-23 11:53:41 +0200 |
|---|---|---|
| committer | Pavel Šimerda <psimerda@redhat.com> | 2012-11-05 14:01:47 +0100 |
| commit | d82669d3fdaa7ec70ef1b64941c101ac810c394b (patch) | |
| tree | 02556450a8dcb124b9ad1a8ccce8f25fc87586c6 /src/settings/plugins/keyfile/Makefile.am | |
| parent | 811c87f8ae4c2d24fc0c40e8158cd5fe66475ec8 (diff) | |
build: unify NetworkManager path handling (some paths are changed)
Use autoconf/automake variables for NetworkManager paths. Use
NetworkManager subdirectory where appropriate.
Files in /var/run (or /run on some distros) are moved into a separate
directory as is usual with other daemons. It makes the filesystem
more readable and file prefixing unnecessary.
/var/run/NetworkManager.pid -> /var/run/NetworkManager/NetworkManager.pid
/var/run/nm-dns-dnsmasq.pid -> /var/run/NetworkManager/dnsmasq.pid
/var/run/nm-dns-dnsmasq.conf -> /var/run/NetworkManager/dnsmasq.conf
The /var/run/NetworkManager directory is created at runtime, if it doesn't
exist.
Note: Path-based security policies like SELinux and AppArmor may need to
be adapted.
Diffstat (limited to 'src/settings/plugins/keyfile/Makefile.am')
| -rw-r--r-- | src/settings/plugins/keyfile/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/settings/plugins/keyfile/Makefile.am b/src/settings/plugins/keyfile/Makefile.am index 1e9906d595..dea92da14e 100644 --- a/src/settings/plugins/keyfile/Makefile.am +++ b/src/settings/plugins/keyfile/Makefile.am @@ -26,7 +26,7 @@ libkeyfile_io_la_SOURCES = \ libkeyfile_io_la_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DNMCONFDIR=\"$(nmconfdir)\" libkeyfile_io_la_LIBADD = $(GLIB_LIBS) @@ -41,7 +41,7 @@ libnm_settings_plugin_keyfile_la_SOURCES = \ libnm_settings_plugin_keyfile_la_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DNMCONFDIR=\"$(nmconfdir)\" libnm_settings_plugin_keyfile_la_LIBADD = \ $(top_builddir)/libnm-util/libnm-util.la \ |