$NetBSD: patch-ab,v 1.1.1.1 2006/10/02 17:12:19 rillig Exp $ --- paths.h.orig 1998-03-09 04:56:22.000000000 +0100 +++ paths.h 2006-09-27 12:27:24.000000000 +0200 @@ -14,15 +14,21 @@ /************* Log File Locations (must be writable by **********/ /************* the user given in the squid.conf file **********/ -#define LOG_MATCH "/usr/local/squirm/logs/squirm.match" -#define LOG_FAIL "/usr/local/squirm/logs/squirm.fail" -#define LOG_ERROR "/usr/local/squirm/logs/squirm.error" -#define LOG_WHERE "/usr/local/squirm/logs/squirm.where" -#define LOG_DEBUG "/usr/local/squirm/logs/squirm.debug" -#define LOG_INFO "/usr/local/squirm/logs/squirm.info" +#if !defined(LOGDIR) +#define LOGDIR "/usr/local/squirm/logs" +#endif +#define LOG_MATCH LOGDIR"/squirm.match" +#define LOG_FAIL LOGDIR"/squirm.fail" +#define LOG_ERROR LOGDIR"/squirm.error" +#define LOG_WHERE LOGDIR"/squirm.where" +#define LOG_DEBUG LOGDIR"/squirm.debug" +#define LOG_INFO LOGDIR"/squirm.info" /************* Configuration file locations ***********/ -#define LOCAL_ADDRESSES "/usr/local/squirm/etc/squirm.local" -#define REDIRECT_PATTERNS "/usr/local/squirm/etc/squirm.patterns" +#if !defined(CONFDIR) +#define CONFDIR "/usr/local/squirm/etc" +#endif +#define LOCAL_ADDRESSES CONFDIR"/squirm.local" +#define REDIRECT_PATTERNS CONFDIR"/squirm.patterns" #endif