summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-haskell')
-rw-r--r--dev-haskell/haddock/ChangeLog6
-rw-r--r--dev-haskell/haddock/Manifest4
-rw-r--r--dev-haskell/haddock/haddock-0.6.ebuild22
3 files changed, 18 insertions, 14 deletions
diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index 315bf2a4de6d..ad884c298a72 100644
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-haskell/haddock
# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.5 2003/11/12 14:47:36 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.6 2003/12/16 15:36:18 kosmikus Exp $
+
+ 16 Dec 2003; Andres Loeh <kosmikus@gentoo.org> haddock-0.6.ebuild:
+ Fixed ebuild: Library files now in correct position. Cleaned installation of
+ docs a little bit.
*haddock-0.6 (12 Nov 2003)
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index 3fdcc8e5191c..a49f627511d3 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -1,7 +1,7 @@
MD5 259a626193a148c7b93be296843b4b5e haddock-0.4.ebuild 2056
-MD5 60b669d8a3613246e9eb254b3d0f7d42 haddock-0.6.ebuild 1963
+MD5 1558aa1f0fe1bc31fe82e0e10be5d1dd haddock-0.6.ebuild 1977
MD5 e5986ca528feeab7b061105cfb1c9935 haddock-0.5.ebuild 1963
-MD5 56105552b10485458c62a516e6285181 ChangeLog 1042
+MD5 47fe6188a66f74d0d483f9f4bf261901 ChangeLog 1212
MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
MD5 0fe55540bd0531c1ca8da69fb5098d76 files/haddock-0.4-ghc6.patch 6858
MD5 345c00e86d5388d60c897e487987922a files/digest-haddock-0.4 67
diff --git a/dev-haskell/haddock/haddock-0.6.ebuild b/dev-haskell/haddock/haddock-0.6.ebuild
index 52f8177786fc..e936ab55b43a 100644
--- a/dev-haskell/haddock/haddock-0.6.ebuild
+++ b/dev-haskell/haddock/haddock-0.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.6.ebuild,v 1.1 2003/11/12 14:47:36 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.6.ebuild,v 1.2 2003/12/16 15:36:18 kosmikus Exp $
#
# USE variable summary:
# doc - Build extra documenation from DocBook sources,
@@ -37,14 +37,18 @@ src_compile() {
# breaks otherwise ...
PATH="${GHCPATH}" SGML_CATALOG_FILES="" econf
# using make because emake behaved strangely on my machine
- make || die
+ make || die "make failed"
# if documentation has been requested, build documentation ...
if use doc; then
cd ${S}/haddock/doc
- emake html || die
+ emake html \
+ datadir="/usr/share/doc/${PF}" \
+ || die "emake html failed"
if use tetex; then
- emake ps || die
+ emake ps \
+ datadir="/usr/share/doc/${PF}" \
+ || die "emake ps failed"
fi
fi
}
@@ -52,15 +56,11 @@ src_compile() {
src_install() {
local mydoc
- use doc && mydoc="html" || mydoc=""
- use doc && use tetex && mydoc="${mydoc} ps"
-
- echo SGMLDocWays="${mydoc}" >> mk/build.mk
- make install install-docs \
+ make install \
prefix="${D}/usr" \
- datadir="${D}/usr/share/doc/${PF}" \
+ datadir="${D}/usr/share/${PF}" \
infodir="${D}/usr/share/info" \
- mandir="${D}/usr/share/man" || die
+ mandir="${D}/usr/share/man" || die "make install failed"
cd ${S}/haddock
dodoc CHANGES LICENSE README TODO