rpms/ghc-rpm-macros
6
0
Fork 0
Code Issues Pull Requests Releases Activity

put docs/haddocks under %ghc_name if defined

Browse Source
This commit is contained in:
Jens Petersen 2021-12-29 10:15:58 +08:00
parent 9e7ffdac88
commit 6a30ca822b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ghc-rpm-macros.spec
View File

@ -7,7 +7,7 @@
%endif %endif
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 2.3.9 Version: 2.3.10
Release: 1%{?dist} Release: 1%{?dist}
Summary: RPM macros for building Haskell packages for GHC Summary: RPM macros for building Haskell packages for GHC
@ -184,6 +184,9 @@ EOF
%changelog %changelog
* Wed Dec 29 2021 Jens Petersen <petersen@redhat.com> - 2.3.10-1
- ghc_html_dir: use ghc_name for ghcX.Y docs
* Mon Dec 20 2021 Jens Petersen <petersen@redhat.com> - 2.3.9-1 * Mon Dec 20 2021 Jens Petersen <petersen@redhat.com> - 2.3.9-1
- ghc-deps.sh: only exclude unversioned rts.conf - ghc-deps.sh: only exclude unversioned rts.conf

2
macros.ghc
View File

@ -45,7 +45,7 @@ fi\
%ghc_pkgdocdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} %ghc_pkgdocdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
# root dir for ghc docs (used by ghc.spec) # root dir for ghc docs (used by ghc.spec)
%ghc_html_dir %{_docdir}/ghc/html %ghc_html_dir %{_docdir}/%{?ghc_name}%{!?ghc_name:ghc}/html
# deprecates # deprecates
%ghcdocbasedir %ghc_html_dir %ghcdocbasedir %ghc_html_dir