Split out sysconfdir (/etc) and confdir (/etc/dkimpy-milter) in expand

system/dkimpy-milter.in

@@ -18,7 +18,7 @@
 # Short-Description: dkimpy-milter
 # Description:       Python DKIM Milter for Sendmail and Postfix
 ### END INIT INFO
-sysconfdir="@SYSCONFDIR@"
+sysconfdir="@CONFDIR@"
 bindir="@BINDIR@"
 RUNDIR="@RUNSTATEDIR@"
 DAEMON=${bindir}/dkimpy-milter
@@ -33,8 +33,8 @@ test -x $DAEMON || exit 0
 
 # Include dkimpy-python defaults if available
 # Typically not used
-if [ -f /etc/default/dkimpy-milter ] ; then
-	. /etc/default/dkimpy-milter
+if [ -f @SYSCONFDIR@/default/dkimpy-milter ] ; then
+	. @SYSCONFDIR@/default/dkimpy-milter
 fi
 
 set -e

system/dkimpy-milter.openrc.in

@@ -2,7 +2,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-CONFFILE="@SYSCONFDIR@/${RC_SVCNAME}.conf"
+CONFFILE="@CONFDIR@/${RC_SVCNAME}.conf"
 required_files="${CONFFILE}"
 
 command="@BINDIR@/dkimpy-milter"

system/dkimpy-milter.service.in

@@ -6,7 +6,7 @@ After=network.target
 [Service]
 Type=simple
 PIDFile=@RUNSTATEDIR@/dkimpy-milter.pid
-ExecStart=@BINDIR@/dkimpy-milter @SYSCONFDIR@/dkimpy-milter.conf
+ExecStart=@BINDIR@/dkimpy-milter @CONFDIR@/dkimpy-milter.conf
 
 [Install]
 WantedBy=multi-user.target

system/socket-activation/dkimpy-milter.service.in

@@ -4,7 +4,7 @@ Documentation=man:dkimpy-milter(8) man:dkimpy-milter.conf(5)
 Requires=dkimpy-milter.socket
 
 [Service]
-ExecStart=@BINDIR@/dkimpy-milter @SYSCONFDIR@/dkimpy-milter.conf
+ExecStart=@BINDIR@/dkimpy-milter @CONFDIR@/dkimpy-milter.conf
 User=dkimpy-milter
 
 [Install]