From: Jackie Huang <jackie.huang@windriver.com>
Date: Fri, 24 Apr 2020 08:26:31 +0000 (+0800)
Subject: haproxy: fix for the sbindir
X-Git-Tag: bronze-rc0~74
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=e23712280ad704d1de09434226f6358f35f37b42;p=pti%2Frtp.git

haproxy: fix for the sbindir

The SBINDIR should not point to bindir

Issue-ID: INF-33
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: I9f60cdec7f5b09396e20f1156da62af4a0856c37
---

diff --git a/meta-stx/recipes-connectivity/haproxy/haproxy.inc b/meta-stx/recipes-connectivity/haproxy/haproxy.inc
index b94dd36..3ce55be 100644
--- a/meta-stx/recipes-connectivity/haproxy/haproxy.inc
+++ b/meta-stx/recipes-connectivity/haproxy/haproxy.inc
@@ -72,7 +72,7 @@ do_configure() {
 }
 
 do_compile() {
-	oe_runmake CC="${CC}" CFLAGS="${CFLAGS}" SBINDIR="${bindir}" \
+	oe_runmake CC="${CC}" CFLAGS="${CFLAGS}" SBINDIR="${sbindir}" \
 	           PREFIX="${prefix}" \
 	           ZLIB_INC=${STAGING_INCDIR} \
 	           ZLIB_LIB=${STAGING_LIBDIR} \
@@ -87,7 +87,7 @@ do_compile() {
 do_install() {
 	oe_runmake install-bin \
 	           PREFIX="${prefix}" \
-	           SBINDIR="${bindir}" \
+	           SBINDIR="${sbindir}" \
 	           DESTDIR=${D} \
 	           INCLUDEDIR=${includedir}