summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Francisco Araujo <araujo@gentoo.org>2005-12-16 10:59:32 +0000
committerLuis Francisco Araujo <araujo@gentoo.org>2005-12-16 10:59:32 +0000
commitb863500794eec69d9cbf22d7158afa6ebc01eb41 (patch)
treee723add425fef1a9fa980192d796618f0395fb18 /dev-haskell
parentMove elibtoolize after libtoolize, see bug #106176. (diff)
downloadgentoo-2-b863500794eec69d9cbf22d7158afa6ebc01eb41.tar.gz
gentoo-2-b863500794eec69d9cbf22d7158afa6ebc01eb41.tar.bz2
gentoo-2-b863500794eec69d9cbf22d7158afa6ebc01eb41.zip
Fixed library locations.
(Portage version: 2.0.51.22-r3)
Diffstat (limited to 'dev-haskell')
-rw-r--r--dev-haskell/hs-plugins/ChangeLog6
-rw-r--r--dev-haskell/hs-plugins/Manifest12
-rw-r--r--dev-haskell/hs-plugins/hs-plugins-0.9.10-r1.ebuild11
3 files changed, 9 insertions, 20 deletions
diff --git a/dev-haskell/hs-plugins/ChangeLog b/dev-haskell/hs-plugins/ChangeLog
index b779f85d415c..3b637c347a3d 100644
--- a/dev-haskell/hs-plugins/ChangeLog
+++ b/dev-haskell/hs-plugins/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-haskell/hs-plugins
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hs-plugins/ChangeLog,v 1.8 2005/12/12 22:05:49 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hs-plugins/ChangeLog,v 1.9 2005/12/16 10:59:32 araujo Exp $
+
+ 16 Dec 2005; Luis F. Araujo <araujo@gentoo.org>
+ hs-plugins-0.9.10-r1.ebuild:
+ Fixed library locations.
*hs-plugins-0.9.10-r1 (12 Dec 2005)
diff --git a/dev-haskell/hs-plugins/Manifest b/dev-haskell/hs-plugins/Manifest
index 40e963fc7e01..f81d97118452 100644
--- a/dev-haskell/hs-plugins/Manifest
+++ b/dev-haskell/hs-plugins/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 918aef710f63720ea0d980d8960bd309 ChangeLog 1175
MD5 c61ca0ef9d84c675dfdefa1e1e1f33fe hs-plugins-0.9.6.ebuild 779
MD5 1a599d524ebd834499dd7e64eaf71a4b hs-plugins-0.9.8.ebuild 1109
MD5 271db8af4d4636c2b1ff7fcc2d903d71 metadata.xml 160
-MD5 32a4db17632accd41443855d350e05d4 hs-plugins-0.9.10-r1.ebuild 1738
+MD5 676be3471bfc74498ee311f84859b8e7 hs-plugins-0.9.10-r1.ebuild 1426
MD5 cf6036e55a430934f50b03f1904f87cf files/digest-hs-plugins-0.9.6 134
MD5 5a354330583e81ac898f6f5ec9f2dd9a files/digest-hs-plugins-0.9.8 134
MD5 ca9b254d139eb304aefa5c8485e2a01f files/digest-hs-plugins-0.9.10-r1 135
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDnfUOdZ42PGEF17URAgRtAKD7fSeLl7ycH+wODZgqN4SLOtU1rQCePsQ4
-sesS1KA8UsHNCu/PuFRDOcE=
-=CSBY
------END PGP SIGNATURE-----
diff --git a/dev-haskell/hs-plugins/hs-plugins-0.9.10-r1.ebuild b/dev-haskell/hs-plugins/hs-plugins-0.9.10-r1.ebuild
index 89c9795f644f..2a1b9f84ac14 100644
--- a/dev-haskell/hs-plugins/hs-plugins-0.9.10-r1.ebuild
+++ b/dev-haskell/hs-plugins/hs-plugins-0.9.10-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hs-plugins/hs-plugins-0.9.10-r1.ebuild,v 1.1 2005/12/12 22:05:49 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hs-plugins/hs-plugins-0.9.10-r1.ebuild,v 1.2 2005/12/16 10:59:32 araujo Exp $
inherit ghc-package
@@ -20,8 +20,6 @@ DEPEND="virtual/ghc
src_unpack() {
unpack ${A}
- # Don't create a $(ghc-libdir)/hs-plugins/ subdirectory.
- sed -i "s:\$(PREFIX)\/lib/hs-\$(PACKAGE):$(ghc-libdir):" ${S}/config.mk.in
# for package management
sed -i 's:\$(GHC_PKG) -u:\${GHC_PKGF} -u:' ${S}/Makefile
@@ -44,11 +42,9 @@ src_compile() {
}
src_install() {
- emake PREFIX=${D}/$(ghc-libdir) \
- LIBDIR=${D}/$(ghc-libdir) install
+ emake PREFIX="${D}/usr" install
ghc-setup-pkg
- #emake PREFIX=${D}/$(ghc-libdir) register # then we don't need --force in ghc-pkg
- emake register
+ emake PREFIX="${D}/usr" register # then we don't need --force in ghc-pkg
ghc-install-pkg
dodoc AUTHORS README TODO VERSION
@@ -57,4 +53,3 @@ src_install() {
dohtml ${WORKDIR}/${PN}/*
fi
}
-