From 944f8877aa3b0e8ff9ea383141112cfeb27f77be Mon Sep 17 00:00:00 2001 From: Robert Love Date: Fri, 3 Feb 2006 17:50:33 +0000 Subject: [PATCH] 2006-02-03 Robert Love * dispatcher-daemon/NetworkManagerDispatcher.c, dispatcher-daemon/Makefile.am: Don't hardcode the location of /etc but use the sysconfdir. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1438 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ dispatcher-daemon/Makefile.am | 3 ++- dispatcher-daemon/NetworkManagerDispatcher.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 47e587614c..c7fa9f38ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-02-03 Robert Love + + * dispatcher-daemon/NetworkManagerDispatcher.c, + dispatcher-daemon/Makefile.am: Don't hardcode the location of /etc + but use the sysconfdir. + 2006-02-03 Robert Love * src/nm-device-802-11-wireless.c, src/nm-device-802-11-wireless.h: diff --git a/dispatcher-daemon/Makefile.am b/dispatcher-daemon/Makefile.am index ce2b943041..470e7584d6 100644 --- a/dispatcher-daemon/Makefile.am +++ b/dispatcher-daemon/Makefile.am @@ -10,7 +10,8 @@ NetworkManagerDispatcher_CPPFLAGS = \ -Wall \ -DDBUS_API_SUBJECT_TO_CHANGE \ -DBINDIR=\"$(bindir)\" \ - -DDATADIR=\"$(datadir)\" \ + -DDATADIR=\"$(datadir)\" \ + -DSYSCONFDIR=\"$(sysconfdir)\" \ $(NULL) NetworkManagerDispatcher_SOURCES = NetworkManagerDispatcher.c diff --git a/dispatcher-daemon/NetworkManagerDispatcher.c b/dispatcher-daemon/NetworkManagerDispatcher.c index 1854218af1..f10207c14e 100644 --- a/dispatcher-daemon/NetworkManagerDispatcher.c +++ b/dispatcher-daemon/NetworkManagerDispatcher.c @@ -48,7 +48,7 @@ enum NMDAction typedef enum NMDAction NMDAction; -#define NM_SCRIPT_DIR "/etc/NetworkManager/dispatcher.d" +#define NM_SCRIPT_DIR SYSCONFDIR"/NetworkManager/dispatcher.d" /*