add %ghc_docdir for package's docdir
I think rpm or at least redhat-rpm-config should provide such a macro
This commit is contained in:
parent
40a7e828d4
commit
8bc7b06720
@ -21,11 +21,13 @@ fi
|
||||
# configure
|
||||
%cabal_configure\
|
||||
%ghc_check_bootstrap\
|
||||
%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name} --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} --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
|
||||
|
||||
# F20 has unversioned docdir's
|
||||
%ghc_docdir %{_docdir}/%{name}
|
||||
# root dir for ghc docs
|
||||
%ghcdocbasedir %{_docdir}/ghc/html
|
||||
# libraries doc dir
|
||||
|
@ -6,7 +6,7 @@
|
||||
#%%global without_hscolour 1
|
||||
|
||||
Name: ghc-rpm-macros
|
||||
Version: 1.0.6
|
||||
Version: 1.0.7
|
||||
Release: 1%{?dist}
|
||||
Summary: RPM macros for building packages for GHC
|
||||
|
||||
@ -90,6 +90,9 @@ EOF
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Jul 26 2013 Jens Petersen <petersen@redhat.com> - 1.0.7-1
|
||||
- add ghc_docdir for package's docdir since not provided by standard macros
|
||||
|
||||
* Fri Jul 26 2013 Jens Petersen <petersen@redhat.com> - 1.0.6-1
|
||||
- also make %ghc_lib_build docdir unversioned
|
||||
- require redhat-rpm-config >= 9.1.0-50.fc20 for unversioned docdir
|
||||
|
Loading…
Reference in New Issue
Block a user