From e4c93cb77ec4532e1d04315e4ad7bf86fabd77ab Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Feb 10 2014 09:36:05 +0000
Subject: set datasubdir in cabal_configure for ghc-7.8


pkg datadir should not be arch dependent!

---

diff --git a/ghc-deps.sh b/ghc-deps.sh
index 28e39a1..324926c 100755
--- a/ghc-deps.sh
+++ b/ghc-deps.sh
@@ -16,7 +16,7 @@ PKGCONFDIR=$PKGBASEDIR/package.conf.d
 GHC_VER=$(basename $PKGBASEDIR | sed -e s/ghc-//)
 
 if [ -x "$PKGBASEDIR/bin/ghc-pkg" ]; then
-    # ghc-7.7
+    # ghc-7.8
     GHC_PKG="$PKGBASEDIR/bin/ghc-pkg --global-package-db=$PKGCONFDIR"
 elif [ -x "$PKGBASEDIR/ghc-pkg" ]; then
     GHC_PKG="$PKGBASEDIR/ghc-pkg --global-package-db=$PKGCONFDIR"
diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index b22ca20..8eae438 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -21,7 +21,7 @@ fi
 # configure
 %cabal_configure\
 %ghc_check_bootstrap\
-%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_pkgdocdir} --libsubdir='$compiler/$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?cabal_configure_options} $cabal_configure_extra_options
+%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_pkgdocdir} --libsubdir='$compiler/$pkgid' --datasubdir='$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?cabal_configure_options} $cabal_configure_extra_options
 
 # install
 %cabal_install %cabal copy --destdir=%{buildroot} -v
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 3def8a4..c83708a 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -6,7 +6,7 @@
 #%%global without_hscolour 1
 
 Name:           ghc-rpm-macros
-Version:        1.2.2
+Version:        1.2.3
 Release:        1%{?dist}
 Summary:        RPM macros for building packages for GHC
 
@@ -90,6 +90,9 @@ EOF
 
 
 %changelog
+* Mon Feb 10 2014 Jens Petersen <petersen@redhat.com> - 1.2.3-1
+- set datasubdir in cabal_configure for ghc-7.8
+
 * Fri Jan 10 2014 Jens Petersen <petersen@redhat.com> - 1.2.2-1
 - quote the ghc_fix_dynamic_rpath error message