| 1 |
commit: 707f933c98950a47f589d97538fb43346e6cd796 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 18 08:52:12 2021 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 18 08:58:27 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=707f933c |
| 7 |
|
| 8 |
dev-lang/ghc: use /usr/share/doc/${PF} |
| 9 |
|
| 10 |
Reported-by: Agostino Sarubbo |
| 11 |
Closes: https://bugs.gentoo.org/802699 |
| 12 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 13 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-lang/ghc/ghc-8.10.4-r1.ebuild | 4 ++-- |
| 16 |
dev-lang/ghc/ghc-8.10.5-r1.ebuild | 4 ++-- |
| 17 |
dev-lang/ghc/ghc-8.8.4-r1.ebuild | 4 ++-- |
| 18 |
dev-lang/ghc/ghc-9.0.1-r1.ebuild | 4 ++-- |
| 19 |
4 files changed, 8 insertions(+), 8 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-lang/ghc/ghc-8.10.4-r1.ebuild b/dev-lang/ghc/ghc-8.10.4-r1.ebuild |
| 22 |
index 2e9a527ec4b..0e4472b1c7d 100644 |
| 23 |
--- a/dev-lang/ghc/ghc-8.10.4-r1.ebuild |
| 24 |
+++ b/dev-lang/ghc/ghc-8.10.4-r1.ebuild |
| 25 |
@@ -527,8 +527,8 @@ src_configure() { |
| 26 |
echo '# Gentoo changes' > mk/build.mk |
| 27 |
|
| 28 |
# Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV} |
| 29 |
- echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk |
| 30 |
- echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk |
| 31 |
+ echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk |
| 32 |
+ echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk |
| 33 |
|
| 34 |
# We also need to use the GHC_FLAGS flags when building ghc itself |
| 35 |
echo "SRC_HC_OPTS+=${HCFLAGS} ${GHC_FLAGS}" >> mk/build.mk |
| 36 |
|
| 37 |
diff --git a/dev-lang/ghc/ghc-8.10.5-r1.ebuild b/dev-lang/ghc/ghc-8.10.5-r1.ebuild |
| 38 |
index 9fbc3261778..79ac41c9b9d 100644 |
| 39 |
--- a/dev-lang/ghc/ghc-8.10.5-r1.ebuild |
| 40 |
+++ b/dev-lang/ghc/ghc-8.10.5-r1.ebuild |
| 41 |
@@ -526,8 +526,8 @@ src_configure() { |
| 42 |
echo '# Gentoo changes' > mk/build.mk |
| 43 |
|
| 44 |
# Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV} |
| 45 |
- echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk |
| 46 |
- echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk |
| 47 |
+ echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk |
| 48 |
+ echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk |
| 49 |
|
| 50 |
# We also need to use the GHC_FLAGS flags when building ghc itself |
| 51 |
echo "SRC_HC_OPTS+=${HCFLAGS} ${GHC_FLAGS}" >> mk/build.mk |
| 52 |
|
| 53 |
diff --git a/dev-lang/ghc/ghc-8.8.4-r1.ebuild b/dev-lang/ghc/ghc-8.8.4-r1.ebuild |
| 54 |
index 02ac100382e..6254a54371a 100644 |
| 55 |
--- a/dev-lang/ghc/ghc-8.8.4-r1.ebuild |
| 56 |
+++ b/dev-lang/ghc/ghc-8.8.4-r1.ebuild |
| 57 |
@@ -538,8 +538,8 @@ src_configure() { |
| 58 |
echo '# Gentoo changes' > mk/build.mk |
| 59 |
|
| 60 |
# Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV} |
| 61 |
- echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk |
| 62 |
- echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk |
| 63 |
+ echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk |
| 64 |
+ echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk |
| 65 |
|
| 66 |
# We also need to use the GHC_FLAGS flags when building ghc itself |
| 67 |
echo "SRC_HC_OPTS+=${HCFLAGS} ${GHC_FLAGS}" >> mk/build.mk |
| 68 |
|
| 69 |
diff --git a/dev-lang/ghc/ghc-9.0.1-r1.ebuild b/dev-lang/ghc/ghc-9.0.1-r1.ebuild |
| 70 |
index f42fb4d7554..6feaed8be49 100644 |
| 71 |
--- a/dev-lang/ghc/ghc-9.0.1-r1.ebuild |
| 72 |
+++ b/dev-lang/ghc/ghc-9.0.1-r1.ebuild |
| 73 |
@@ -526,8 +526,8 @@ src_configure() { |
| 74 |
echo '# Gentoo changes' > mk/build.mk |
| 75 |
|
| 76 |
# Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV} |
| 77 |
- echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk |
| 78 |
- echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk |
| 79 |
+ echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk |
| 80 |
+ echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk |
| 81 |
|
| 82 |
# We also need to use the GHC_FLAGS flags when building ghc itself |
| 83 |
echo "SRC_HC_OPTS+=${HCFLAGS} ${GHC_FLAGS}" >> mk/build.mk |
Archives