[ghc-rpm-macros/f18] add ghcpkgdocdir and use _pkgdocdir

[Jens Petersen]

commit 8b8d74fd9a6dbb82db9128c035250035ff020ca3
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Oct 25 17:28:02 2013 +0900

    add ghcpkgdocdir and use _pkgdocdir

 ghc-rpm-macros.ghc  |    6 ++++--
 ghc-rpm-macros.spec |    6 +++++-
 2 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index 31f8290..6f5c3fa 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -1,5 +1,5 @@
 # RPM Macros for packaging Haskell cabalized packages  -*-rpm-spec-*-
-# see https://fedoraproject.org/wiki/PackagingDrafts/Haskell for more details
+# see https://fedoraproject.org/wiki/Packaging:Haskell for more details
 
 # "cabal"
 %cabal [ -x Setup ] || ghc --make %{!?ghc_user_conf:-no-user-package-conf} %{!?ghc_without_dynamic:-dynamic} Setup\
@@ -21,7 +21,7 @@ fi
 # configure
 %cabal_configure\
 %ghc_check_bootstrap\
-%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} --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} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} --libsubdir='$compiler/$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?cabal_configure_options} $cabal_configure_extra_options
 
 # install
 %cabal_install %cabal copy --destdir=%{buildroot} -v
@@ -30,6 +30,8 @@ fi
 %ghcdocbasedir %{_docdir}/ghc/html
 # libraries doc dir
 %ghclibdocdir %{ghcdocbasedir}/libraries
+# pkg doc dir
+%ghcpkgdocdir %{ghcdocbasedir}/libraries/%{pkg_name}-%{version}
 # top library dir
 %ghclibdir %{_libdir}/ghc-%{ghc_version}
 
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index e29261f..185f78e 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -6,7 +6,7 @@
 #%%global without_hscolour 1
 
 Name:           ghc-rpm-macros
-Version:        0.95.13
+Version:        0.95.14
 Release:        1%{?dist}
 Summary:        RPM macros for building packages for GHC
 
@@ -76,6 +76,10 @@ EOF
 
 
 %changelog
+* Fri Oct 25 2013 Jens Petersen <petersen at redhat.com> - 0.95.14-1
+- add ghcpkgdocdir
+- use _pkgdocdir
+
 * Thu Jul 11 2013 Jens Petersen <petersen at redhat.com> - 0.95.13-1
 - remove ghc_clear_execstack since the executable stack issue does seem
   to happen with ghc-7.4.1