From 18ec412cf980a6414dba4a197eb971abe9958214 Mon Sep 17 00:00:00 2001
From: fourtysixandtwo <fourtysixandtwo@sliderr.net>
Date: Mon, 29 Apr 2024 16:32:08 -0600
Subject: system/Solaar: Fix building on -current.

With permission from Erich.
---
 system/Solaar/Solaar.SlackBuild | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/system/Solaar/Solaar.SlackBuild b/system/Solaar/Solaar.SlackBuild
index e7d077043f..b739b40052 100644
--- a/system/Solaar/Solaar.SlackBuild
+++ b/system/Solaar/Solaar.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=Solaar
 VERSION=${VERSION:-1.1.11}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -68,7 +68,11 @@ find -L . \
 
 python3 setup.py install --root=$PKG
 
-mv $PKG/usr/lib $PKG/
+# 20240429 46and2: make sure to only move the udev dir to $PKG/lib/
+#   and remove $PKG/usr/lib if empty.
+mkdir $PKG/lib
+mv $PKG/usr/lib/udev $PKG/lib/
+rmdir --ignore-fail-on-non-empty $PKG/usr/lib
 sed -i 's/#MODE="0660", GROUP="plugdev"/MODE="0660", GROUP="plugdev"/g' $PKG/lib/udev/rules.d/42-logitech-unify-permissions.rules
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-- 
cgit v1.2.3