From c6ebe00c11f94196d13bf64db9e14d47bc9169c8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 13 Jan 2023 08:24:03 +0800 Subject: [PATCH] use upstream paths for libHS*.so unless _ghcdynlibdir --- macros.ghc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/macros.ghc b/macros.ghc index b2da3d8..3ddc86e 100644 --- a/macros.ghc +++ b/macros.ghc @@ -98,11 +98,11 @@ echo "%%license %{pkgnamever}/$i" >> %{basepkg}.files\ done\ fi\ %endif\ -for i in %{buildroot}%{?_ghcdynlibdir}%{!?_ghcdynlibdir:%{ghclibplatform}}/libHS%{pkgnamever}-*ghc%{ghc_version}.so; do\ +for i in %{buildroot}%{?_ghcdynlibdir}%{!?_ghcdynlibdir:%ghclibplatform%{!?with_hadrian:/%{pkgnamever}}}/libHS%{pkgnamever}-*ghc%{ghc_version}.so; do\ if [ -x "$i" ]; then\ echo $i >> %{basepkg}.files\ else\ -echo %{buildroot}%{?_ghcdynlibdir}%{!?_ghcdynlibdir:%{ghclibplatform}}/libHS%{pkgnamever}-*ghc%{ghc_version}.so not found\ +echo %{buildroot}%{?_ghcdynlibdir}%{!?_ghcdynlibdir:$pkgdir}/libHS%{pkgnamever}-*ghc%{ghc_version}.so not found\ %if 0%{!-m:1}\ exit 1\ %endif\