mangle unit file to take into account bindir and multiple instances

diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
index 92dcd7583a790c5461d0f1e391d085d334f1aeb0..331408fa8f440d0cf199a0157b4d80a26963035d 100644 (file)
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -623,7 +623,7 @@ endif
 
 if HAVE_SYSTEMD
 pdns-recursor.service: pdns-recursor.service.in
-       $(AM_V_GEN)sed -e 's![@]sbindir[@]!$(sbindir)!' -e 's![@]service_user[@]!$(service_user)!' -e 's![@]service_group[@]!$(service_group)!' < $< > $@
+       $(AM_V_GEN)sed -e 's![@]bindir[@]!$(bindir)!' -e 's![@]sbindir[@]!$(sbindir)!' -e 's![@]service_user[@]!$(service_user)!' -e 's![@]service_group[@]!$(service_group)!' < $< > $@
 if !HAVE_SYSTEMD_WITH_RUNTIME_DIR_ENV
 if HAVE_SYSTEMD_PERCENT_T
        $(AM_V_GEN)sed -e 's!/pdns_recursor!& --socket-dir=%t/pdns-recursor!' -i $@
@@ -697,6 +697,7 @@ pdns-recursor@.service: pdns-recursor.service
        $(AM_V_GEN)sed -e 's!/pdns_recursor!& --config-name=%i!' \
          -e 's!Recursor!& %i!' \
          -e 's!SyslogIdentifier=.*!&-%i!' \
+         -e 's!--socket-dir=%t/pdns-recursor!--socket-dir=%t/pdns-recursor-%i --config-name=%i!' \
          < $< > $@
 if HAVE_SYSTEMD_PERCENT_T
        $(AM_V_GEN)sed -e 's!RuntimeDirectory=.*!&-%i!' -i $@