diff -urN apcupsd-3.10.13.orig/autoconf/acconfig.h apcupsd-3.10.13.new/autoconf/acconfig.h --- apcupsd-3.10.13.orig/autoconf/acconfig.h 2004-04-16 15:18:42.000000000 +0200 +++ apcupsd-3.10.13.new/autoconf/acconfig.h 2004-05-22 15:54:12.854409808 +0200 @@ -97,6 +97,10 @@ /* Define the default "log" files directory. */ #undef LOGDIR +/* Define the default "status" files directory. */ +#undef STATDIR + + /* Define the default serial port lock directory */ #undef LOCKDIR --- apcupsd-3.10.13.orig/autoconf/configure.in 2004-04-16 20:14:57.000000000 +0200 +++ apcupsd-3.10.13.new/autoconf/configure.in 2004-05-22 19:09:30.116115272 +0200 @@ -1188,16 +1188,25 @@ # Find the default directory to put the root-mode PID file in for PIDDIR in "/var/run" "/etc/apcupsd" do - if test -d $PIDDIR + if test -d $PIDDIR then break; fi done -# Find the default directory to put the apcupsd.events and apcupsd.status files +# Find the default directory to put the apcupsd.events file for LOGDIR in "/var/log" "/etc/apcupsd" do - if test -d $LOGDIR + if test -d $LOGDIR + then + break; + fi +done + +# Find the default directory to put the apcupsd.status file +for STATDIR in "/var/log" "/etc/apcupsd" "/var/lib/apcupsd" +do + if test -d $STATDIR then break; fi @@ -1497,11 +1506,18 @@ ) # now allow user to specify LOGDIR AC_ARG_WITH(log-dir, - [AC_HELP_STRING([--with-log-dir=DIR], [Specify EVENTS and STATUS directory (default is OS dependent)])], + [AC_HELP_STRING([--with-log-dir=DIR], [Specify EVENTS directory (default is OS dependent)])], [ LOGDIR="$withval"; ] ) +# now allow user to specify STATDIR +AC_ARG_WITH(stat-dir, + [AC_HELP_STRING([--with-stat-dir=DIR], [Specify STATUS directory (default is OS dependent)])], + [ + STATDIR="$withval"; + ] +) # now allow user to specify LOCKDIR AC_ARG_WITH(lock-dir, [ --with-lock-dir=DIR Specify serial port lock directory (default is OS dependent)], @@ -1575,6 +1591,8 @@ AC_SUBST(PIDDIR) AC_DEFINE_UNQUOTED(LOGDIR, "$LOGDIR") AC_SUBST(LOGDIR) +AC_DEFINE_UNQUOTED(STATDIR, "$STATDIR") +AC_SUBST(STATDIR) AC_DEFINE_UNQUOTED(NOLOGDIR, "$nologdir") AC_SUBST(nologdir) AC_DEFINE_UNQUOTED(PWRFAILDIR, "$PWRFAILDIR") @@ -1735,7 +1753,8 @@ Install man files: ${mandir} Nologin file in: ${nologdir} PID directory: ${PIDDIR} - LOG dir (events, status) ${LOGDIR} + LOG dir (events) ${LOGDIR} + STATUS dir (status) ${STATDIR} LOCK dir (for serial port) ${LOCKDIR} Power Fail dir ${PWRFAILDIR} Compiler: ${CC} ${CCVERSION} --- apcupsd-3.10.13.orig/platforms/etc/apcupsd.conf.in 2003-11-26 16:54:47.000000000 +0100 +++ apcupsd-3.10.13.new/platforms/etc/apcupsd.conf.in 2004-05-22 19:11:36.654878456 +0200 @@ -217,7 +217,7 @@ STATTIME 0 # # Location of STATUS file (written to only if STATTIME is non-zero) -STATFILE @LOGDIR@/apcupsd.status +STATFILE @STATDIR@/apcupsd.status # # # LOGSTATS [ on | off ] on enables, off disables