diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 35205d1..ce65fbc 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -7,7 +7,7 @@ %endif Name: ghc-rpm-macros -Version: 2.3.9 +Version: 2.3.10 Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC @@ -184,6 +184,9 @@ EOF %changelog +* Wed Dec 29 2021 Jens Petersen - 2.3.10-1 +- ghc_html_dir: use ghc_name for ghcX.Y docs + * Mon Dec 20 2021 Jens Petersen - 2.3.9-1 - ghc-deps.sh: only exclude unversioned rts.conf diff --git a/macros.ghc b/macros.ghc index dc91a70..ccc4b1a 100644 --- a/macros.ghc +++ b/macros.ghc @@ -45,7 +45,7 @@ fi\ %ghc_pkgdocdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} # 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 %ghcdocbasedir %ghc_html_dir