diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2014-12-01 11:15:54 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-12-01 11:16:42 +0100 |
| commit | fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb (patch) | |
| tree | fd6edbe93b19b167b105897e3de6a7c11eac4f9c /package/squid | |
| parent | 9a5434fbfc98a0c427c880b167b8ca3499b44e87 (diff) | |
| parent | 9b47f40bb29d9be34afabfb423bab0ad45cbc11f (diff) | |
Merge branch 'next'
Conflicts:
Makefile
package/flac/0001-fix-altivec-logic.patch
package/grantlee/Config.in
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/squid')
| -rw-r--r-- | package/squid/squid.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/package/squid/squid.mk b/package/squid/squid.mk index e8a2ccc1a..306b2a361 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -26,7 +26,11 @@ SQUID_CONF_OPTS = --enable-async-io=8 --enable-linux-netfilter \ --enable-auth-negotiate="wrapper" \ --enable-auth-ntlm="fake" \ --disable-strict-error-checking \ - --enable-external-acl-helpers="file_userip" + --enable-external-acl-helpers="file_userip" \ + --with-logdir=/var/log/squid/ \ + --with-pidfile=/var/run/squid.pid \ + --with-swapdir=/var/cache/squid/ \ + --enable-icap-client # On uClibc librt needs libpthread ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)$(BR2_TOOLCHAIN_USES_UCLIBC),yy) |