diff --git a/configure b/configure index 8403d6bed..fae03df82 100755 --- a/configure +++ b/configure @@ -760,7 +760,6 @@ ub_conf_file UNBOUND_LOCALSTATE_DIR UNBOUND_SYSCONF_DIR UNBOUND_SBIN_DIR -UNBOUND_BIN_DIR EGREP GREP CPP @@ -4131,8 +4130,6 @@ fi # # Determine configuration file # the eval is to evaluate shell expansion twice -UNBOUND_BIN_DIR=`eval echo "${bindir}"` - UNBOUND_SBIN_DIR=`eval echo "${sbindir}"` UNBOUND_SYSCONF_DIR=`eval echo "${sysconfdir}"` diff --git a/configure.ac b/configure.ac index 4409a26a4..d48c32666 100644 --- a/configure.ac +++ b/configure.ac @@ -125,8 +125,6 @@ fi # # Determine configuration file # the eval is to evaluate shell expansion twice -UNBOUND_BIN_DIR=`eval echo "${bindir}"` -AC_SUBST(UNBOUND_BIN_DIR) UNBOUND_SBIN_DIR=`eval echo "${sbindir}"` AC_SUBST(UNBOUND_SBIN_DIR) UNBOUND_SYSCONF_DIR=`eval echo "${sysconfdir}"` diff --git a/contrib/unbound.service.in b/contrib/unbound.service.in index 3ada5758c..b3856690a 100644 --- a/contrib/unbound.service.in +++ b/contrib/unbound.service.in @@ -6,7 +6,7 @@ Documentation=man:unbound(8) WantedBy=multi-user.target [Service] -ExecReload=@UNBOUND_BIN_DIR@/kill -HUP $MAINPID +ExecReload=/bin/kill -HUP $MAINPID ExecStart=@UNBOUND_SBIN_DIR@/unbound NotifyAccess=main Type=notify diff --git a/doc/Changelog b/doc/Changelog index acf73e0b8..338c3b6e6 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +18 May 2017: Wouter + - Fix #1265 to use /bin/kill. + 17 May 2017: Wouter - Fix #1265: contrib/unbound.service contains hardcoded path.