From 6df70a31a0aaadeec3ada5d492bd7fc31f69202c Mon Sep 17 00:00:00 2001
From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 19 Jul 2011 00:04:19 +1200
Subject: [PATCH] Bug 3267: workers IPC mount points disobey --localstatedir

---
 src/ipc/Makefile.am | 5 ++++-
 src/ipc/Port.cc     | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/ipc/Makefile.am b/src/ipc/Makefile.am
index 4cda3bba0a..3c25e2e971 100644
--- a/src/ipc/Makefile.am
+++ b/src/ipc/Makefile.am
@@ -36,4 +36,7 @@ libipc_la_SOURCES = \
 	Request.h \
 	Response.h
 
-DEFS += -DDEFAULT_PREFIX=\"$(prefix)\"
+DEFS += -DDEFAULT_STATEDIR=\"$(localstatedir)/run/squid\"
+
+install-data-local:
+        $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/squid;
diff --git a/src/ipc/Port.cc b/src/ipc/Port.cc
index fb2fb73d8c..710fde7bf4 100644
--- a/src/ipc/Port.cc
+++ b/src/ipc/Port.cc
@@ -12,8 +12,8 @@
 #include "comm/Connection.h"
 #include "ipc/Port.h"
 
-const char Ipc::coordinatorAddr[] = DEFAULT_PREFIX "/var/run/coordinator.ipc";
-const char Ipc::strandAddrPfx[] = DEFAULT_PREFIX "/var/run/squid";
+const char Ipc::coordinatorAddr[] = DEFAULT_STATEDIR "/coordinator.ipc";
+const char Ipc::strandAddrPfx[] = DEFAULT_STATEDIR "/kid";
 
 
 Ipc::Port::Port(const String& aListenAddr):
-- 
2.47.2