rpms/ghc/F-9 ghc-rpm-macros.ghc,1.1,1.2

[Bryan O'Sullivan]

Author: bos

Update of /cvs/extras/rpms/ghc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv642

Modified Files:
	ghc-rpm-macros.ghc 
Log Message:
Backport macros


Index: ghc-rpm-macros.ghc
===================================================================
RCS file: /cvs/extras/rpms/ghc/F-9/ghc-rpm-macros.ghc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ghc-rpm-macros.ghc	14 Oct 2008 01:45:10 -0000	1.1
+++ ghc-rpm-macros.ghc	15 Oct 2008 03:51:42 -0000	1.2
@@ -1,7 +1,7 @@
 %cabal %{_bindir}/runhaskell Setup
 
 %cabal_configure \
-%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} --libsubdir='$compiler/$pkgid'
+%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} --htmldir=%{_docdir}/%{hsc_name}/libraries/%{pkg_name} --haddockdir=%{_docdir}/%{hsc_name}/libraries/%{pkg_name} --libsubdir='$compiler/$pkgid'
 
 %cabal_build \
 %cabal build \
@@ -17,7 +17,7 @@
 %{nil}
 
 %cabal_install \
-%cabal copy --destdir=${RPM_BUILD_ROOT} \
+%cabal copy --destdir=${RPM_BUILD_ROOT} -v \
 %{nil}
 
 %ghc_gen_filelists() \
@@ -55,3 +55,11 @@
 [ "$1" = 1 ] && %{pkg_libdir}/register.sh >& /dev/null || : \
 %{nil}
 
+%ghc_reindex_haddock \
+if [ -f %{_bindir}/haddock -a -d %{_docdir}/%{hsc_name}/libraries ]; then \
+cd %{_docdir}/%{hsc_name}/libraries && \
+haddock --gen-index --gen-contents -o . -t 'Haskell Hierarchical Libraries' \\\
+$(find . \\( \\( -path ./ghc -o -path ./ghc-prim \\) -prune \\) -o \\( -name '*.haddock' -print \\) \\\
+| sed 's!.*/\\([^/]*\\).haddock!--read-interface=\\1,\\0!'); \
+fi \
+%{nil}