1 diff -urN apcupsd-3.10.13.orig/autoconf/acconfig.h apcupsd-3.10.13.new/autoconf/acconfig.h
2 --- apcupsd-3.10.13.orig/autoconf/acconfig.h 2004-04-16 15:18:42.000000000 +0200
3 +++ apcupsd-3.10.13.new/autoconf/acconfig.h 2004-05-22 15:54:12.854409808 +0200
5 /* Define the default "log" files directory. */
8 +/* Define the default "status" files directory. */
12 /* Define the default serial port lock directory */
15 --- apcupsd-3.10.13.orig/autoconf/configure.in 2004-04-16 20:14:57.000000000 +0200
16 +++ apcupsd-3.10.13.new/autoconf/configure.in 2004-05-22 19:09:30.116115272 +0200
17 @@ -1188,16 +1188,25 @@
18 # Find the default directory to put the root-mode PID file in
19 for PIDDIR in "/var/run" "/etc/apcupsd"
28 -# Find the default directory to put the apcupsd.events and apcupsd.status files
29 +# Find the default directory to put the apcupsd.events file
30 for LOGDIR in "/var/log" "/etc/apcupsd"
39 +# Find the default directory to put the apcupsd.status file
40 +for STATDIR in "/var/log" "/etc/apcupsd" "/var/lib/apcupsd"
46 @@ -1497,11 +1506,18 @@
48 # now allow user to specify LOGDIR
50 - [AC_HELP_STRING([--with-log-dir=DIR], [Specify EVENTS and STATUS directory (default is OS dependent)])],
51 + [AC_HELP_STRING([--with-log-dir=DIR], [Specify EVENTS directory (default is OS dependent)])],
56 +# now allow user to specify STATDIR
57 +AC_ARG_WITH(stat-dir,
58 + [AC_HELP_STRING([--with-stat-dir=DIR], [Specify STATUS directory (default is OS dependent)])],
63 # now allow user to specify LOCKDIR
65 [ --with-lock-dir=DIR Specify serial port lock directory (default is OS dependent)],
68 AC_DEFINE_UNQUOTED(LOGDIR, "$LOGDIR")
70 +AC_DEFINE_UNQUOTED(STATDIR, "$STATDIR")
72 AC_DEFINE_UNQUOTED(NOLOGDIR, "$nologdir")
74 AC_DEFINE_UNQUOTED(PWRFAILDIR, "$PWRFAILDIR")
76 Install man files: ${mandir}
77 Nologin file in: ${nologdir}
78 PID directory: ${PIDDIR}
79 - LOG dir (events, status) ${LOGDIR}
80 + LOG dir (events) ${LOGDIR}
81 + STATUS dir (status) ${STATDIR}
82 LOCK dir (for serial port) ${LOCKDIR}
83 Power Fail dir ${PWRFAILDIR}
84 Compiler: ${CC} ${CCVERSION}
85 --- apcupsd-3.10.13.orig/platforms/etc/apcupsd.conf.in 2003-11-26 16:54:47.000000000 +0100
86 +++ apcupsd-3.10.13.new/platforms/etc/apcupsd.conf.in 2004-05-22 19:11:36.654878456 +0200
90 # Location of STATUS file (written to only if STATTIME is non-zero)
91 -STATFILE @LOGDIR@/apcupsd.status
92 +STATFILE @STATDIR@/apcupsd.status
95 # LOGSTATS [ on | off ] on enables, off disables