Improve build and package functions.

1 files changed, 14 insertions, 2 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 9fbba48ae747..86bdbca12d10 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -34,11 +34,23 @@ prepare() {
 
 build() {
     cd ${pkgname}-${pkgver}
-    runhaskell Setup configure -O --prefix=/usr --docdir=/usr/share/doc/${pkgname}
+
+    runhaskell Setup configure --ghc -O \
+                               --prefix='/usr' \
+                               --libsubdir='$compiler/site-local/$pkgid' \
+                               --docdir='$prefix/share/doc/$pkg' \
+                               --datadir='$prefix/share' \
+                               --datasubdir='$pkg'
     runhaskell Setup build
 }
 
 package() {
-    cd ${srcdir}/${pkgname}-${pkgver}
+    cd ${pkgname}-${pkgver}
+
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+
     runhaskell Setup copy --destdir=${pkgdir}
+
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+    rmdir --ignore-fail-on-non-empty -p ${pkgdir}/usr/share/doc/${pkgname}
 }