let lcdproc & lcdexec have their own private config file;

install server & client config files to $(sysconfdir) (using automake features)

clients/lcdproc/Makefile.am

@@ -1,5 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
+sysconf_DATA = lcdproc.conf
+
 bin_PROGRAMS = lcdproc
 
 lcdproc_SOURCES = main.c main.h mode.c mode.h batt.c batt.h chrono.c chrono.h cpu.c cpu.h cpu_smp.c cpu_smp.h disk.c disk.h load.c load.h mem.c mem.h machine.h machine_Linux.c machine_OpenBSD.c machine_FreeBSD.c machine_NetBSD.c machine_Darwin.c machine_SunOS.c util.c util.h
@@ -10,6 +12,9 @@ if DARWIN
 AM_LDFLAGS = -framework CoreFoundation -framework IOKit
 endif
 
-AM_CPPFLAGS = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir) -DSYSCONFDIR=\"$(sysconfdir)\"
+
+
+EXTRA_DIST = $(sysconf_DATA)
 
 ## EOF

clients/lcdproc/main.c

@@ -57,14 +57,24 @@ static void exit_program(int val);
 static void main_loop();
 static int process_command_line(int argc, char **argv);
 static int process_configfile(char *cfgfile);
+
+
 #define CHAIN(e,f) { if (e>=0 ) { e=(f); }}
 #define CHAIN_END(e,msg) { if (e<0 ) { report( RPT_CRIT,(msg)); exit(e); }}
 
-static int islow = -1;
-
 // 1/8th second is a single time unit...
 #define TIME_UNIT 125000
 
+#if !defined(SYSCONFDIR)
+# define SYSCONFDIR "/etc"
+#endif
+
+#define UNSET_INT -1	 
+#define UNSET_STR "\01"
+#define DEFAULT_SERVER		"127.0.0.1"
+#define DEFAULT_CONFIGFILE	SYSCONFDIR "/lcdproc.conf"
+
+
 /* list of modes to run */
 mode sequence[] =
 {
@@ -89,12 +99,8 @@ mode sequence[] =
 
 
 
-// TODO: Config file; not just command line
 /* All variables are set to 'unset' values*/
-#define UNSET_INT -1	 
-#define UNSET_STR "\01"
-#define DEFAULT_SERVER		"127.0.0.1"
-#define DEFAULT_CONFIGFILE	"/usr/local/etc/lcdproc.conf"
+static int islow = -1;
 char * progname = "lcdproc";
 char * server 	= NULL;
 int port	= LCDPORT;