1 diff -urN apcupsd-3.10.12.orig/autoconf/acconfig.h apcupsd-3.10.12.new/autoconf/acconfig.h
2 --- apcupsd-3.10.12.orig/autoconf/acconfig.h 2003-03-08 16:14:52.000000000 +0100
3 +++ apcupsd-3.10.12.new/autoconf/acconfig.h 2004-04-08 12:40:17.892974408 +0200
5 /* Define the default "log" files directory. */
8 +/* Define the default "status" files directory. */
11 /* Define the default serial port lock directory */
14 diff -urN apcupsd-3.10.12.orig/autoconf/configure.in apcupsd-3.10.12.new/autoconf/configure.in
15 --- apcupsd-3.10.12.orig/autoconf/configure.in 2004-03-04 11:48:42.000000000 +0100
16 +++ apcupsd-3.10.12.new/autoconf/configure.in 2004-04-08 13:13:47.029539224 +0200
17 @@ -1176,10 +1176,19 @@
21 -# Find the default directory to put the apcupsd.events and apcupsd.status files
22 +# Find the default directory to put the apcupsd.events file
23 for LOGDIR in "/var/log" "/etc/apcupsd"
32 +# Find the default directory to put the apcupsd.status file
33 +for STATDIR in "/var/log" "/etc/apcupsd"
39 @@ -1479,11 +1488,18 @@
41 # now allow user to specify LOGDIR
43 - [ --with-log-dir=DIR Specify EVENTS and STATUS directory (default is OS dependent)],
44 + [ --with-log-dir=DIR Specify EVENTS directory (default is OS dependent)],
49 +# now allow user to specify STATDIR
50 +AC_ARG_WITH(stat-dir,
51 + [ --with-stat-dir=DIR Specify STATUS directory (default is OS dependent)],
56 # now allow user to specify LOCKDIR
58 [ --with-lock-dir=DIR Specify serial port lock directory (default is OS dependent)],
61 AC_DEFINE_UNQUOTED(LOGDIR, "$LOGDIR")
63 +AC_DEFINE_UNQUOTED(STATDIR, "$STATDIR")
65 AC_DEFINE_UNQUOTED(NOLOGDIR, "$nologdir")
67 AC_DEFINE_UNQUOTED(PWRFAILDIR, "$PWRFAILDIR")
69 Install man files: ${mandir}
70 Nologin file in: ${nologdir}
71 PID directory: ${PIDDIR}
72 - LOG dir (events, status) ${LOGDIR}
73 + LOG dir (events) ${LOGDIR}
74 + STATUS dir (status) ${STATDIR}
75 LOCK dir (for serial port) ${LOCKDIR}
76 Power Fail dir ${PWRFAILDIR}
77 Compiler: ${CC} ${CCVERSION}
78 diff -urN apcupsd-3.10.12.orig/platforms/etc/apcupsd.conf.in apcupsd-3.10.12.new/platforms/etc/apcupsd.conf.in
79 --- apcupsd-3.10.12.orig/platforms/etc/apcupsd.conf.in 2003-11-26 16:54:47.000000000 +0100
80 +++ apcupsd-3.10.12.new/platforms/etc/apcupsd.conf.in 2004-04-08 13:27:59.542937488 +0200
84 # Location of STATUS file (written to only if STATTIME is non-zero)
85 -STATFILE @LOGDIR@/apcupsd.status
86 +STATFILE @STATDIR@/apcupsd.status
89 # LOGSTATS [ on | off ] on enables, off disables