From: Mladen Sablic <mladen.sablic@gmail.com>
Date: Tue, 3 Apr 2018 13:51:45 +0000 (+0200)
Subject: debianpkg: rules WANT_FRR_USER bug
X-Git-Tag: frr-4.0.1~17^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=e4231f363e9d2c3dcfb0fac7dbaab7d6ed55ba1c;p=matthieu%2Ffrr.git

debianpkg: rules WANT_FRR_USER bug

WANT_FRR_USER was not prepended by appropriate command line
option for configure.

Signed-off-by: Mladen Sablic <mladen.sablic@gmail.com>
---

diff --git a/debianpkg/backports/ubuntu12.04/debian/rules b/debianpkg/backports/ubuntu12.04/debian/rules
index 5c3e1363ce..831540d557 100755
--- a/debianpkg/backports/ubuntu12.04/debian/rules
+++ b/debianpkg/backports/ubuntu12.04/debian/rules
@@ -69,8 +69,8 @@ ifndef WANT_FRR_USER
   USE_FRR_USER=--enable-user=frr
   USE_FRR_GROUP=--enable-group=frr
 else
-  USE_FRR_USER=$(WANT_FRR_USER)
-  USE_FRR_GROUP=$(WANT_FRR_USER)
+  USE_FRR_USER=--enable-user=$(WANT_FRR_USER)
+  USE_FRR_GROUP=--enable-group=$(WANT_FRR_USER)
 endif
 
 ifndef WANT_FRR_VTY_GROUP
diff --git a/debianpkg/backports/ubuntu14.04/debian/rules b/debianpkg/backports/ubuntu14.04/debian/rules
index a30144c9d6..34575b95ac 100755
--- a/debianpkg/backports/ubuntu14.04/debian/rules
+++ b/debianpkg/backports/ubuntu14.04/debian/rules
@@ -78,8 +78,8 @@ ifndef WANT_FRR_USER
   USE_FRR_USER=--enable-user=frr
   USE_FRR_GROUP=--enable-group=frr
 else
-  USE_FRR_USER=$(WANT_FRR_USER)
-  USE_FRR_GROUP=$(WANT_FRR_USER)
+  USE_FRR_USER=--enable-user=$(WANT_FRR_USER)
+  USE_FRR_GROUP=--enable-group=$(WANT_FRR_USER)
 endif
 
 ifndef WANT_FRR_VTY_GROUP
diff --git a/debianpkg/rules b/debianpkg/rules
index b66740decf..cbc2a1e96d 100755
--- a/debianpkg/rules
+++ b/debianpkg/rules
@@ -78,8 +78,8 @@ ifndef WANT_FRR_USER
   USE_FRR_USER=--enable-user=frr
   USE_FRR_GROUP=--enable-group=frr
 else
-  USE_FRR_USER=$(WANT_FRR_USER)
-  USE_FRR_GROUP=$(WANT_FRR_USER)
+  USE_FRR_USER=--enable-user=$(WANT_FRR_USER)
+  USE_FRR_GROUP=--enable-group=$(WANT_FRR_USER)
 endif
 
 ifndef WANT_FRR_VTY_GROUP