8e94015934
Update to new Haskell packaging guidelines and ghc 7.6.3 changes. OBS-URL: https://build.opensuse.org/request/show/185234 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=11
31 lines
1.8 KiB
Diff
31 lines
1.8 KiB
Diff
Index: ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa/ghc-rpm-macros.ghc
|
|
===================================================================
|
|
--- ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa.orig/ghc-rpm-macros.ghc
|
|
+++ ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa/ghc-rpm-macros.ghc
|
|
@@ -21,13 +21,14 @@ 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=%{_docdir}/%{name} %{?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
|
|
|
|
# root dir for ghc docs
|
|
-%ghcdocbasedir %{_docdir}/ghc/html
|
|
+%ghcdocroot %{_datadir}/doc/ghc
|
|
+%ghcdocbasedir %{ghcdocroot}/html
|
|
# libraries doc dir
|
|
%ghclibdocdir %{ghcdocbasedir}/libraries
|
|
# top library dir
|
|
@@ -100,7 +101,7 @@ find %{buildroot} -type f -exec sh -c "f
|
|
# ghc_lib_build_without_haddock [name] [version]
|
|
%ghc_lib_build_without_haddock()\
|
|
%global debug_package %{nil}\
|
|
-%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?1:--docdir=%{_docdir}/ghc-%1-%2 --htmldir=%{ghclibdocdir}/%1-%2} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\
|
|
+%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?1:--docdir=%{_docdir}/ghc-%1 --htmldir=%{ghclibdocdir}/%1-%2} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\
|
|
%cabal build\
|
|
%{nil}
|
|
|