summaryrefslogtreecommitdiff
path: root/src/dns-manager/Makefile.am
diff options
context:
space:
mode:
authorPavel Šimerda <psimerda@redhat.com>2012-08-23 11:53:41 +0200
committerPavel Šimerda <psimerda@redhat.com>2012-11-05 14:01:47 +0100
commitd82669d3fdaa7ec70ef1b64941c101ac810c394b (patch)
tree02556450a8dcb124b9ad1a8ccce8f25fc87586c6 /src/dns-manager/Makefile.am
parent811c87f8ae4c2d24fc0c40e8158cd5fe66475ec8 (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/dns-manager/Makefile.am')
-rw-r--r--src/dns-manager/Makefile.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/dns-manager/Makefile.am b/src/dns-manager/Makefile.am
index f275a1f156..e6c2ff2209 100644
--- a/src/dns-manager/Makefile.am
+++ b/src/dns-manager/Makefile.am
@@ -24,7 +24,9 @@ libdns_manager_la_CPPFLAGS = \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS) \
-DLOCALSTATEDIR=\"$(localstatedir)\" \
- -DSYSCONFDIR=\"$(sysconfdir)\"
+ -DSYSCONFDIR=\"$(sysconfdir)\" \
+ -DNMCONFDIR=\"$(nmconfdir)\" \
+ -DNMRUNDIR=\"$(nmrundir)\"
libdns_manager_la_LIBADD = \
$(top_builddir)/src/logging/libnm-logging.la \