From 3a9982f1d7bba6029c438bead7f553e25fbb7fe1 Mon Sep 17 00:00:00 2001 From: Jakub Jirutka <jakub@jirutka.cz> Date: Sat, 18 Sep 2021 02:30:29 +0200 Subject: [PATCH] testing/greetd: use new makefile for building/installing man pages --- testing/greetd/APKBUILD | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/testing/greetd/APKBUILD b/testing/greetd/APKBUILD index c76a5e8bf720..cd37903ad74f 100644 --- a/testing/greetd/APKBUILD +++ b/testing/greetd/APKBUILD @@ -16,7 +16,7 @@ source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~kennylevinsen/greetd/archive $pkgname.pam $pkgname.initd $pkgname.confd - 001-change-greetd-runas.patch + config.patch " builddir="$srcdir/$pkgname-$pkgver" @@ -24,13 +24,7 @@ export RUSTFLAGS="--remap-path-prefix=$builddir=/build/" build() { cargo build --release --locked - - local dst src - for src in man/*.scd; do - dst=${src%.scd}; dst=${dst%-*}.${dst##*-} # foo-1.scd -> foo.1 - scdoc < $src > $dst - done - + make -C man } check() { @@ -47,9 +41,7 @@ package() { install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname - local i; for i in man/*.[0-9]; do - install -Dm644 $i "$pkgdir"/usr/share/man/man${i##*.}/${i##*/} - done + make -C man install PREFIX=/usr DESTDIR="$pkgdir" } agreety() { @@ -64,5 +56,5 @@ sha512sums=" 0f786b639223bf52445b7248756bc2e83a450a81e0750f853b70095a0438edb0c40ecc50df42cdb82838a068202787d5286ca5ebc363e6e1c4e969f122df5dfa greetd.pam b3a035901fa2ec5a1652e9c9660d204f074b68311508464976cdf70925f2614c8eb0866563f2b09257bd5b79cb149e12abe723abce4911ce6668d4f1bc4582ba greetd.initd f6c5d5755fb8cca3d45d6879557fb7fc85c40879bc570e6c9aac462ce9133a2fa0a03cbac1e598f8162a9136d3e6020cea808e16e1797f4d37d4cf7dfc94c11c greetd.confd -90a8b0e836fa29dd143ba08b0f9824403acddda2c964217e999aef2272ad7acda2da2b914ee35db7a365423cc0fccfb61521df7b6519fa9e5b6356ff1ae8b801 001-change-greetd-runas.patch +da49e5993e2189567d0661ea63a69dafb650ab4a1dfebdfa346dff2e2c195d1d8fdb1f2cd4f9f64b26fd2c0b453df2886cd19d6afc59680b6fb4c54eab97c729 config.patch " -- GitLab