From 2a37a28d72ecaf9165eb75a66bce886984641cc6 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Wed, 6 May 2015 15:37:56 +0900
Subject: [PATCH] Revert "Substitute bindir for nghttpx.service"

This reverts commit 7bb154f768aaf546b9e858c671f5a0f42b3dba6d.
---
 configure.ac                                      |  2 --
 contrib/.gitignore                                |  4 ----
 contrib/Makefile.am                               | 15 ++++++++-------
 .../{nghttpx-init.template.in => nghttpx-init.in} |  4 ++--
 ...ghttpx.service.template.in => nghttpx.service} |  2 +-
 5 files changed, 11 insertions(+), 16 deletions(-)
 rename contrib/{nghttpx-init.template.in => nghttpx-init.in} (97%)
 rename contrib/{nghttpx.service.template.in => nghttpx.service} (73%)

diff --git a/configure.ac b/configure.ac
index 232c9c64..0d2220b3 100644
--- a/configure.ac
+++ b/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
 
diff --git a/contrib/.gitignore b/contrib/.gitignore
index a9fa9f81..a08baf90 100644
--- a/contrib/.gitignore
+++ b/contrib/.gitignore
@@ -1,5 +1 @@
 nghttpx-init
-nghttpx-init.template
-nghttpx.service
-nghttpx.service.template
-
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 748f1cbb..8f12126f 100644
--- a/contrib/Makefile.am
+++ b/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
diff --git a/contrib/nghttpx-init.template.in b/contrib/nghttpx-init.in
similarity index 97%
rename from contrib/nghttpx-init.template.in
rename to contrib/nghttpx-init.in
index 8367d810..a1620a97 100644
--- a/contrib/nghttpx-init.template.in
+++ b/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
diff --git a/contrib/nghttpx.service.template.in b/contrib/nghttpx.service
similarity index 73%
rename from contrib/nghttpx.service.template.in
rename to contrib/nghttpx.service
index f6e0eed4..71367be4 100644
--- a/contrib/nghttpx.service.template.in
+++ b/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