From 124ef72e774bb47fd3676de15b09d75f70e1e5b2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Feb 01 2016 14:16:39 +0000 Subject: use %ghc_name for %ghc_html_dir --- diff --git a/macros.ghc b/macros.ghc index 9ea624c..8b5dc11 100644 --- a/macros.ghc +++ b/macros.ghc @@ -40,19 +40,19 @@ LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS\ %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 %{_docdir}/ghc/html +%ghcdocbasedir %ghc_html_dir # libraries doc dir (internal) %ghc_html_libraries_dir %{ghc_html_dir}/libraries # deprecates -%ghclibdocdir %{ghcdocbasedir}/libraries +%ghclibdocdir %ghc_html_libraries_dir # pkg doc dir %ghc_html_pkg_dir %{ghc_html_libraries_dir}/%{pkg_name}-%{version} # deprecates -%ghcpkgdocdir %{ghclibdocdir}/%{pkg_name}-%{version} +%ghcpkgdocdir %ghc_html_pkg_dir # top library dir %ghclibdir %{_libdir}/ghc-%{ghc_version}