[ghc-rpm-macros/f19] add ghc_docdir for package docdir

[Jens Petersen]

commit 396a1b8acd8be6789be1ec71c743d4e850876c35
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Jul 26 15:25:21 2013 +0900

    add ghc_docdir for package docdir
    
    this should allow portability between versioned and unversioned docdir

 ghc-rpm-macros.ghc  |    3 ++-
 ghc-rpm-macros.spec |    5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index 2478f43..c6b99b0 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -21,11 +21,12 @@ 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=%{ghc_docdir} %{?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
 
+%ghc_docdir %{_docdir}/%{name}-%{version}
 # root dir for ghc docs
 %ghcdocbasedir %{_docdir}/ghc/html
 # libraries doc dir
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 10250ff..e3aeff8 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.98.3
+Version:        0.98.4
 Release:        1%{?dist}
 Summary:        RPM macros for building packages for GHC
 
@@ -76,6 +76,9 @@ EOF
 
 
 %changelog
+* Fri Jul 26 2013 Jens Petersen <petersen at redhat.com> - 0.98.4-1
+- add ghc_docdir for package docdir
+
 * Thu Jul 11 2013 Jens Petersen <petersen at redhat.com> - 0.98.3-1
 - add new ghc_clear_execstack to ghc_bin_install and ghc_lib_install (#973512)
   and require prelink for execstack