diff --git a/Makefile b/Makefile index 1d1bd5a2..21c95c5b 100644 --- a/Makefile +++ b/Makefile @@ -255,6 +255,7 @@ install:: $(call quiet-installdir,0755,${DESTDIR}${SYSCONFDIR}/mxq) $(call quiet-installdir,0755,${DESTDIR}${MAN1DIR}) $(call quiet-installdir,0755,${DESTDIR}${CGIDIR}) + $(call quiet-installdir,0755,${DESTDIR}${LOCALSTATEDIR}/log) ######################################################################## diff --git a/mxq.h b/mxq.h index 54b073f9..aac59fe1 100644 --- a/mxq.h +++ b/mxq.h @@ -46,6 +46,12 @@ #endif #define MXQ_MYSQL_DEFAULT_GROUP_STR MXQ_MYSQL_DEFAULT_GROUP +#if defined (LOCALSTATEDIR) +# define MXQ_LOGDIR LOCALSTATEDIR "/log" +#else +# define MXQ_LOGDIR "/var/log" +#endif + static void mxq_print_generic_version(void) { printf( diff --git a/mxqd.c b/mxqd.c index 167ed126..97fb7d60 100644 --- a/mxqd.c +++ b/mxqd.c @@ -92,6 +92,9 @@ static void print_usage(void) " -M, --mysql-default-file [mysql-file] default: %s\n" " -S, --mysql-default-group [mysql-group] default: %s\n" "\n" + "Directories:\n" + " LOGDIR " MXQ_LOGDIR "\n" + "\n" "Environment:\n" " MXQ_MYSQL_DEFAULT_FILE change default for [mysql-file]\n" " MXQ_MYSQL_DEFAULT_GROUP change default for [mysql-group]\n" @@ -499,11 +502,11 @@ int server_init(struct mxq_server *server, int argc, char *argv[]) setup_stdin("/dev/null"); if (!arg_nolog) { - if (access("/var/log",R_OK|W_OK|X_OK)) { - mx_log_err("MAIN: cant write to /var/log: %m"); + if (access(MXQ_LOGDIR, R_OK|W_OK|X_OK)) { + mx_log_err("MAIN: cant write to " MXQ_LOGDIR ": %m"); exit(EX_IOERR); } - res = setup_cronolog("/usr/sbin/cronolog", "/var/log/mxqd_log", "/var/log/%Y/mxqd_log-%Y-%m"); + res = setup_cronolog("/usr/sbin/cronolog", MXQ_LOGDIR "/mxqd_log", MXQ_LOGDIR "/%Y/mxqd_log-%Y-%m"); if (!res) { mx_log_err("MAIN: cronolog setup failed. exiting."); exit(EX_IOERR);