From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 2 Nov 2015 17:47:43 +0000 (+0000)
Subject: BUG/BUILD: replace haproxy-systemd-wrapper with $(EXTRA) in install-bin.
X-Git-Tag: v1.7-dev1~59
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=796d2fc136359c31c5c35f00c0751890ab42a016;p=thirdparty%2Fhaproxy.git

BUG/BUILD: replace haproxy-systemd-wrapper with $(EXTRA) in install-bin.

[wt: this should be backported to 1.6 and 1.5 as well since some platforms
 don't build the systemd-wrapper]
---

diff --git a/Makefile b/Makefile
index 4f0aa8af70..84b1f78b7e 100644
--- a/Makefile
+++ b/Makefile
@@ -805,10 +805,9 @@ install-doc:
 		install -m 644 doc/$$x.txt "$(DESTDIR)$(DOCDIR)" ; \
 	done
 
-install-bin: haproxy haproxy-systemd-wrapper
+install-bin: haproxy $(EXTRA)
 	install -d "$(DESTDIR)$(SBINDIR)"
-	install haproxy "$(DESTDIR)$(SBINDIR)"
-	install haproxy-systemd-wrapper "$(DESTDIR)$(SBINDIR)"
+	install haproxy $(EXTRA) "$(DESTDIR)$(SBINDIR)"
 
 install: install-bin install-man install-doc