From: octo <octo>
Date: Fri, 16 Dec 2005 10:32:22 +0000 (+0000)
Subject: Merged changes from revision 314 (branches/collectd-configfile) to trunk
X-Git-Tag: collectd-3.5.0~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=69a36d8615e8f6b07fc24ff4937e5f4a1c60e012;p=collectd.git

Merged changes from revision 314 (branches/collectd-configfile) to trunk
---

69a36d8615e8f6b07fc24ff4937e5f4a1c60e012
diff --cc src/Makefile.am
index ae7df9ba,1d246a91..c15e91ee
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -9,11 -11,12 +9,11 @@@ collectd_SOURCES = collectd.c collectd.
  		   utils_mount.c utils_mount.h \
  		   common.c common.h \
  		   multicast.c multicast.h \
 -		   plugin.c plugin.h \
 -		   configfile.c configfile.h
 +		   plugin.c plugin.h
  #collectd_CFLAGS = -DPLUGINDIR='"$(pkglibdir)"'
  collectd_CPPFLAGS =
- collectd_CPPFLAGS += -DSYSCONFDIR='"${sysconfdir}"'
- collectd_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/${PACKAGE_NAME}"'
+ collectd_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"'
+ collectd_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"'
  collectd_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
  collectd_CPPFLAGS += -DPLUGINDIR='"${pkglibdir}"'
  collectd_LDFLAGS = -export-dynamic
diff --cc src/collectd.c
index 9932fd90,8e92bfbc..5e28918e
--- a/src/collectd.c
+++ b/src/collectd.c
@@@ -242,10 -243,10 +242,10 @@@ int main (int argc, char **argv
  	pid_t pid;
  #endif
  
- 	char *confdir = SYSCONFDIR;
- 	char *pidfile =  PIDFILE;
- 	char *plugindir = PLUGINDIR;
- 	char *datadir = PKGLOCALSTATEDIR;
 - 	char *configfile = CONFIGFILE;
 - 	char *pidfile    = PIDFILE;
 - 	char *plugindir  = PLUGINDIR;
 - 	char *datadir    = PKGLOCALSTATEDIR;
++	char *configfile = CONFIGFILE
++	char *pidfile    = PIDFILE;
++	char *plugindir  = PLUGINDIR;
++	char *datadir    = PKGLOCALSTATEDIR;
  
  	int daemonize = 1;