Bug 3267: workers IPC mount points disobey --localstatedir

diff --git a/src/ipc/Makefile.am b/src/ipc/Makefile.am
index 4cda3bba0a4a21a35dace70d7beb48b3444c48f7..3c25e2e971ea27631bad90fc4d606ce3770d3c52 100644 (file)
--- 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 fb2fb73d8c584836f91590fee7fb532f5a47642c..710fde7bf40b7a6e65347d8f69e642ddb0374269 100644 (file)
--- 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):