diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index 87c0998..e9e8b92 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -92,7 +92,7 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \ # 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} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} %{?1:--docdir=%{_docdir}/ghc-%1-%2 --htmldir=%{ghclibdocdir}/%1-%2} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci} --ghc-option=-O2\ +%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} %{?1:--docdir=%{_docdir}/ghc-%1-%2 --htmldir=%{ghclibdocdir}/%1-%2} --global %{?ghc_with_lib_for_ghci:--enable-library-for-ghci} --ghc-option=-O2\ %cabal build\ %{nil} diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 65c858c..81a1163 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.99.4 +Version: 1.0 Release: 1%{?dist} Summary: RPM macros for building packages for GHC @@ -87,6 +87,9 @@ EOF %changelog +* Wed Jun 19 2013 Jens Petersen - 1.0-1 +- add --global to cabal_configure + * Mon Jun 17 2013 Jens Petersen - 0.99.4-1 - merge remaining extra macros into ghc_lib_subpackage