Revert "Substitute bindir for nghttpx.service"

This reverts commit 7bb154f768.

configure.ac

@@ -650,8 +650,6 @@ AC_CONFIG_FILES([
   doc/asio_http2_client.h.rst
   doc/contribute.rst
   contrib/Makefile
-  contrib/nghttpx-init.template
-  contrib/nghttpx.service.template
 ])
 AC_OUTPUT
 

contrib/.gitignore

@@ -1,5 +1 @@
 nghttpx-init
-nghttpx-init.template
-nghttpx.service
-nghttpx.service.template
-

contrib/Makefile.am

@@ -21,18 +21,19 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-EXTRA_DIST = nghttpx-init.template.in nghttpx.service.template.in \
-	nghttpx-logrotate
+EXTRA_DIST = nghttpx-init.in nghttpx.service nghttpx-logrotate
 
-edit = sed -e 's|$$(bindir)|$(bindir)|g'
+edit = sed -e 's|@bindir[@]|$(bindir)|g'
 
-nghttpx-init nghttpx.service: %: $(srcdir)/%.template
+nghttpx-init: Makefile
 	rm -f $@ $@.tmp
-	$(edit) $< > $@.tmp
+	$(edit) $(srcdir)/$@.in > $@.tmp
 	chmod +x $@.tmp
 	mv $@.tmp $@
 
-all-local: nghttpx-init nghttpx.service
+nghttpx-init: $(srcdir)/nghttpx-init.in
+
+all-local: nghttpx-init
 
 clean-local:
-	-rm -f nghttpx-init nghttpx-init.tmp nghttpx.service nghttpx.service.tmp
+	-rm -f nghttpx-init nghttpx-init.tmp

contrib/nghttpx-init.in

@@ -17,8 +17,8 @@
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
 DESC="HTTP/2 reverse proxy"
 NAME=nghttpx
-# Depending on the configuration, binary may be located under $(bindir)
-DAEMON=$(bindir)/$NAME
+# Depending on the configuration, binary may be located under @sbindir@
+DAEMON=@bindir@/$NAME
 PIDFILE=/var/run/$NAME.pid
 DAEMON_ARGS="--conf /etc/nghttpx/nghttpx.conf --pid-file=$PIDFILE"
 SCRIPTNAME=/etc/init.d/$NAME

contrib/nghttpx.service

@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=simple
-ExecStart=$(bindir)/nghttpx --errorlog-syslog
+ExecStart=/usr/bin/nghttpx --errorlog-syslog
 
 [Install]
 WantedBy=multi-user.target