rpms/ghc
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update macros to put haddock bits in the right place

Browse Source
This commit is contained in:
Bryan O'Sullivan 2008-10-15 03:42:23 +00:00
parent 8a484b3e87
commit cb5a89f23c
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ghc-rpm-macros.ghc
View File

@ -1,7 +1,7 @@
%cabal %{_bindir}/runhaskell Setup %cabal %{_bindir}/runhaskell Setup
%cabal_configure \ %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 \
%cabal build \ %cabal build \
@ -17,7 +17,7 @@ make -f cabal-rpm.mk %{_smp_mflags} \
%{nil} %{nil}
%cabal_install \ %cabal_install \
%cabal copy --destdir=${RPM_BUILD_ROOT} \ %cabal copy --destdir=${RPM_BUILD_ROOT} -v \
%{nil} %{nil}
%ghc_cabal_configure \ %ghc_cabal_configure \
@ -58,11 +58,11 @@ install -m 755 register.sh unregister.sh ${RPM_BUILD_ROOT}%{pkg_libdir} \
[ "$1" = 1 ] && %{pkg_libdir}/register.sh >& /dev/null || : \ [ "$1" = 1 ] && %{pkg_libdir}/register.sh >& /dev/null || : \
%{nil} %{nil}
%ghc_haddock_reindex \ %ghc_reindex_haddock \
if [ -f %{_bindir}/haddock -a -d %{_docdir}/ghc/libraries ]; then \ if [ -f %{_bindir}/haddock -a -d %{_docdir}/%{hsc_name}/libraries ]; then \
cd %{_docdir}/ghc/libraries && \ cd %{_docdir}/%{hsc_name}/libraries && \
haddock --gen-index --gen-contents -o . -t 'Haskell Hierarchical Libraries' \ haddock --gen-index --gen-contents -o . -t 'Haskell Hierarchical Libraries' \\\
$(find . \( \( -path ./ghc -o -path ./ghc-prim \) -prune \) -o \( -name '*.haddock' -print \) \ $(find . \\( \\( -path ./ghc -o -path ./ghc-prim \\) -prune \\) -o \\( -name '*.haddock' -print \\) \\\
| sed 's!.*/\([^/]*\).haddock!--read-interface=\1,\0!'); \ | sed 's!.*/\\([^/]*\\).haddock!--read-interface=\\1,\\0!'); \
fi \ fi \
%{nil} %{nil}

5
ghc.spec
View File

@ -16,7 +16,7 @@
Name: ghc Name: ghc
Version: 6.10.0.20081007 Version: 6.10.0.20081007
Release: 5%{?dist} Release: 6%{?dist}
Summary: Glasgow Haskell Compilation system Summary: Glasgow Haskell Compilation system
# See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239713 # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239713
ExcludeArch: alpha ppc64 ExcludeArch: alpha ppc64
@ -214,6 +214,9 @@ fi
%changelog %changelog
* Tue Oct 14 2008 Bryan O'Sullivan <bos@serpentine.com> - 6.10.0.20081007-6
- Update macros to install html and haddock bits in the right places
* Tue Oct 14 2008 Bryan O'Sullivan <bos@serpentine.com> - 6.10.0.20081007-5 * Tue Oct 14 2008 Bryan O'Sullivan <bos@serpentine.com> - 6.10.0.20081007-5
- Don't use a macro to update the docs for the main doc package - Don't use a macro to update the docs for the main doc package