rc.yml: update Haskell macros to adapt to new directory layout

Signed-off-by: Gavin Zhao <git@gzgz.dev>
getsolus · Apr 11, 2024 · 63e2577 · 63e2577
1 parent 0c66472
commit 63e2577
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/ypkg2/rc.yml b/ypkg2/rc.yml
@@ -94,9 +94,9 @@ actions:
             export GHCV=$(ghc --numeric-version)
             runhaskell Setup configure --prefix=%PREFIX% \
                                        --libdir=%libdir% \
-                                       --libsubdir="\$compiler/\$pkgid" \
+                                       --libsubdir="\$compiler/lib/\$abi/\$pkg-\$version" \
                                        --libexecdir=%libdir%/%PKGNAME% \
-                                       --dynlibdir="%libdir%/\$compiler/\$pkgid" \
+                                       --dynlibdir="%libdir%/\$compiler/lib/\$abi" \
                                        --datadir=/usr/share \
                                        --datasubdir=%PKGNAME% \
                                        --docdir="/usr/share/doc/%PKGNAME%" \
@@ -115,7 +115,7 @@ actions:
     - haskell_register: &haskell_register |
         export GHCV=$(ghc --numeric-version)
         runhaskell Setup register --gen-pkg-config=$package-$version.conf
-        install -D -m 00644 $package-$version.conf $installdir%libdir%/ghc-$GHCV/package.conf.d/$package-$version.conf
+        install -D -m 00644 $package-$version.conf $installdir/%libdir%/ghc-$GHCV/lib/package.conf.d/$package-$version.conf
     - haskell_check: |
         runhaskell Setup test
     # Configures a Cabal project that requires online dependencies, like a