]>
Commit | Line | Data |
---|---|---|
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 | |
4 | @@ -97,6 +97,10 @@ | |
5 | /* Define the default "log" files directory. */ | |
6 | #undef LOGDIR | |
7 | ||
8 | +/* Define the default "status" files directory. */ | |
9 | +#undef STATDIR | |
10 | + | |
11 | + | |
12 | /* Define the default serial port lock directory */ | |
13 | #undef LOCKDIR | |
14 | ||
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 | @@ -1261,16 +1261,25 @@ | |
18 | # Find the default directory to put the root-mode PID file in | |
19 | for PIDDIR in "/var/run" "/etc/apcupsd" | |
20 | do | |
21 | - if test -d $PIDDIR | |
22 | + if test -d $PIDDIR | |
23 | then | |
24 | break; | |
25 | fi | |
26 | done | |
27 | ||
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" | |
31 | do | |
32 | - if test -d $LOGDIR | |
33 | + if test -d $LOGDIR | |
34 | + then | |
35 | + break; | |
36 | + fi | |
37 | +done | |
38 | + | |
39 | +# Find the default directory to put the apcupsd.status file | |
40 | +for STATDIR in "/var/log" "/etc/apcupsd" "/var/lib/apcupsd" | |
41 | +do | |
42 | + if test -d $STATDIR | |
43 | then | |
44 | break; | |
45 | fi | |
46 | @@ -1499,9 +1508,14 @@ | |
47 | ||
48 | # now allow user to specify LOGDIR | |
49 | AC_ARG_WITH(log-dir, | |
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)])], | |
52 | [LOGDIR="$withval";]) | |
53 | ||
54 | +# now allow user to specify STATDIR | |
55 | +AC_ARG_WITH(stat-dir, | |
56 | + [AC_HELP_STRING([--with-stat-dir=DIR], [Specify STATUS directory (default is OS dependent)])], | |
57 | + [STATDIR="$withval";]) | |
58 | + | |
59 | # now allow user to specify LOCKDIR | |
60 | AC_ARG_WITH(lock-dir, | |
61 | [AC_HELP_STRING([--with-lock-dir=DIR], [Specify serial port lock directory (default is OS dependent)])], | |
62 | @@ -1543,6 +1557,8 @@ | |
63 | AC_SUBST(PIDDIR) | |
64 | AC_DEFINE_UNQUOTED(LOGDIR, "$LOGDIR") | |
65 | AC_SUBST(LOGDIR) | |
66 | +AC_DEFINE_UNQUOTED(STATDIR, "$STATDIR") | |
67 | +AC_SUBST(STATDIR) | |
68 | AC_DEFINE_UNQUOTED(NOLOGDIR, "$nologdir") | |
69 | AC_SUBST(nologdir) | |
70 | AC_DEFINE_UNQUOTED(PWRFAILDIR, "$PWRFAILDIR") | |
71 | @@ -1713,7 +1729,8 @@ | |
72 | Install man files: ${mandir} | |
73 | Nologin file in: ${nologdir} | |
74 | PID directory: ${PIDDIR} | |
75 | - LOG dir (events, status) ${LOGDIR} | |
76 | + LOG dir (events) ${LOGDIR} | |
77 | + STAT dir (status) ${STATDIR} | |
78 | LOCK dir (for serial port) ${LOCKDIR} | |
79 | Power Fail dir ${PWRFAILDIR} | |
80 | Compiler: ${CXX} ${CXXVERSION} | |
81 | --- apcupsd-3.12.1/platforms/etc/apcupsd.conf.in.orig 2005-12-31 00:26:41.000000000 +0100 | |
82 | +++ apcupsd-3.12.1/platforms/etc/apcupsd.conf.in 2006-01-24 13:45:20.000000000 +0100 | |
83 | @@ -227,7 +227,7 @@ | |
84 | STATTIME 0 | |
85 | ||
86 | # Location of STATUS file (written to only if STATTIME is non-zero) | |
87 | -STATFILE @LOGDIR@/apcupsd.status | |
88 | +STATFILE @STATDIR@/apcupsd.status | |
89 | ||
90 | # LOGSTATS [ on | off ] on enables, off disables | |
91 | # Note! This generates a lot of output, so if |