From 35cadacd2bb9383686753731e31bd7e145fb2506 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 27 Apr 2024 06:24:32 +0200
Subject: Merging upstream version 10.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 alpine/APKBUILD.in | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'alpine')

diff --git a/alpine/APKBUILD.in b/alpine/APKBUILD.in
index 9a29ff3..2cb3fee 100644
--- a/alpine/APKBUILD.in
+++ b/alpine/APKBUILD.in
@@ -27,10 +27,9 @@ source="$pkgname-$pkgver.tar.gz"
 
 builddir="$srcdir"/$pkgname-$pkgver
 
+_sysconfdir=/etc
 _sbindir=/usr/lib/frr
-_sysconfdir=/etc/frr
 _libdir=/usr/lib
-_localstatedir=/var/run/frr
 _user=frr
 
 build() {
@@ -38,10 +37,10 @@ build() {
 
 	./configure \
 		--prefix=/usr \
-		--sbindir=$_sbindir \
 		--sysconfdir=$_sysconfdir \
+		--localstatedir=/var \
+		--sbindir=$_sbindir \
 		--libdir=$_libdir \
-		--localstatedir=$_localstatedir \
 		--enable-rpki \
 		--enable-vtysh \
 		--enable-multipath=64 \
@@ -63,7 +62,9 @@ package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
-	install -Dm644 "$builddir"/tools/etc/frr/daemons "$pkgdir"$_sysconfdir/daemons
-	install -d "$pkgdir"/etc/init.d
-	ln -s ${_sbindir}/frr "$pkgdir"/etc/init.d/frr
+	install -d $pkgdir/$_sysconfdir/frr
+	install -m 0644 tools/etc/frr/daemons $pkgdir/$_sysconfdir/frr/daemons
+
+	install -d $pkgdir/$_sysconfdir/init.d
+	ln -s ${_sbindir}/frr $pkgdir/$_sysconfdir/init.d/frr
 }
-- 
cgit v1.2.3