At last!

cabal didn't take the flags if they were passed as part of a variable

1 files changed, 21 insertions, 15 deletions

diff --git a/~fauno/pandoc/PKGBUILD b/~fauno/pandoc/PKGBUILD
index d3b88d3a0..18e249a47 100755
--- a/~fauno/pandoc/PKGBUILD
+++ b/~fauno/pandoc/PKGBUILD
@@ -15,6 +15,9 @@ options=(strip !makeflags !distcc)
 source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig} SRCBUILD)
 conflicts=('haskell-pandoc')
 optdepends=('texlive-most: for pdf creation')
+md5sums=('912abc4574aea3c5203eff1b02ceafa9'
+         '7ac798d62f253535a2e194af5aa1c3c3'
+         'e632f8c06be8284e17329a5d1c459e3b')
 
 # PKGBUILD functions
 build() {
@@ -24,24 +27,30 @@ build() {
    while read _hkpkg; do
        pushd ${srcdir}/${pkgname}-${pkgver}/${_hkpkg} >/dev/null
 
-       extra="--prefix=${srcdir}/build/usr"
+       msg2 "Building $_hkpkg"
+
        case $_hkpkg in
         $pkgname-$pkgver)
-          extra="--flags=\"executable -library\" --prefix=/usr --libdir=${srcdir}/build/usr/lib -v" ;;
-        citeproc-hs-*)
-          extra="--flags=\"embed_data_files\" --prefix=${srcdir}/build/usr -v" ;;
-       esac
+         HOME=${srcdir}/${pkgname}-${pkgver} \
+         cabal configure --flags='-library' \
+                         --prefix=/usr \
+                         --libdir=${srcdir}/build/usr/lib -v
 
-       msg2 "Configuring $_hkpkg with $extra"
-       if [ "$_hkpkg" != "$pkgname-$pkgver" ]; then
          HOME=${srcdir}/${pkgname}-${pkgver} \
-         cabal install $extra
-       else 
+         cabal build
+         ;;
+
+        citeproc-hs-*)
          HOME=${srcdir}/${pkgname}-${pkgver} \
-         cabal configure $extra
+         cabal install --flags='embed_data_files' \
+                       --prefix=${srcdir}/build/usr -v
+         ;;
+
+        *)
          HOME=${srcdir}/${pkgname}-${pkgver} \
-         cabal build
-       fi
+         cabal install --prefix=${srcdir}/build/usr
+         ;;
+       esac
 
        popd >/dev/null
    done <BUILDORDER
@@ -63,6 +72,3 @@ package() {
   find ${pkgdir}/usr/share -type f -exec chmod 644 {} \;
   find ${pkgdir}/usr/share -type d -exec chmod 755 {} \;
 }
-md5sums=('912abc4574aea3c5203eff1b02ceafa9'
-         '7ac798d62f253535a2e194af5aa1c3c3'
-         'e632f8c06be8284e17329a5d1c459e3b')