From 8650f161e99c8ac30ae0b5ce15c900c6ef61bbad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 28 Feb 2021 22:55:13 +0700 Subject: [PATCH] monkey: move libdir to /usr/lib{32,64}/monkey Those shared-objects are plugins for monkey, its included debian rules also put them in /usr/lib/monkey. While we're at it, fix --musl-mode argument. (The actual code doesn't change if MUSL_CODE defined or not) --- srcpkgs/monkey/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/monkey/template b/srcpkgs/monkey/template index 87a67260acf..e910e31586f 100644 --- a/srcpkgs/monkey/template +++ b/srcpkgs/monkey/template @@ -1,9 +1,10 @@ # Template file for 'monkey' pkgname=monkey version=1.6.9 -revision=2 +revision=3 build_style=configure -configure_args="--prefix=/usr --sbindir=/usr/bin --libdir=/usr/lib +configure_args="--prefix=/usr --sbindir=/usr/bin + --libdir=/usr/lib$XBPS_TARGET_WORDSIZE/$pkgname --sysconfdir=/etc/monkey/ --enable-plugins=mbedtls --malloc-libc --webroot=/srv/www/$pkgname --mandir=/usr/share/man --default-user=_monkey --pidfile=/var/run/monkey.pid --logdir=/var/log/monkey" @@ -34,7 +35,7 @@ make_dirs=" CFLAGS="-fcommon" case $XBPS_TARGET_MACHINE in - *-musl) configure_args+="--musl-mode --no-backtrace ";; + *-musl) configure_args+=" --musl-mode --no-backtrace ";; esac post_install() { @@ -47,6 +48,5 @@ monkey-devel_package() { short_desc+=" - development files" pkg_install() { vmove usr/include - vmove "usr/lib/*.so" } }