summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Shapovalov <george@gentoo.org>2002-06-09 22:06:03 +0000
committerGeorge Shapovalov <george@gentoo.org>2002-06-09 22:06:03 +0000
commit836c4161dce2adac123ecc66939dcb9bc89998ac (patch)
tree234d9ee48ca40a5dfe35ffb5c7085f1d823ba64e /dev-lang/nhc98
parentUncommented new orinoco drivers (diff)
downloadgentoo-2-836c4161dce2adac123ecc66939dcb9bc89998ac.tar.gz
gentoo-2-836c4161dce2adac123ecc66939dcb9bc89998ac.tar.bz2
gentoo-2-836c4161dce2adac123ecc66939dcb9bc89998ac.zip
updated ebuild to install correct configuration
Diffstat (limited to 'dev-lang/nhc98')
-rw-r--r--dev-lang/nhc98/ChangeLog7
-rw-r--r--dev-lang/nhc98/files/hmakerc23
-rw-r--r--dev-lang/nhc98/nhc98-1.12.ebuild12
3 files changed, 38 insertions, 4 deletions
diff --git a/dev-lang/nhc98/ChangeLog b/dev-lang/nhc98/ChangeLog
index 3fac1785d100..0d5643157592 100644
--- a/dev-lang/nhc98/ChangeLog
+++ b/dev-lang/nhc98/ChangeLog
@@ -1,8 +1,13 @@
# ChangeLog for dev-lang/nhc98
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nhc98/ChangeLog,v 1.1 2002/06/09 07:38:07 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nhc98/ChangeLog,v 1.2 2002/06/09 22:06:03 george Exp $
*nhc98-1.12.ebuild (08 Jun 2002)
+
+ 09 Jun 2002; George Shapovalov <george@gentoo.org> files/hmakerc, nhc98-1.12.ebuild :
+
+ updated ebuild to install aproperiate config file
+ (configure that ships with package produces weird setup)
08 Jun 2002; George Shapovalov <george@gentoo.org> all :
diff --git a/dev-lang/nhc98/files/hmakerc b/dev-lang/nhc98/files/hmakerc
new file mode 100644
index 000000000000..25ea5b5b4c76
--- /dev/null
+++ b/dev-lang/nhc98/files/hmakerc
@@ -0,0 +1,23 @@
+HmakeConfig
+ { defaultCompiler = "/usr/bin/nhc98"
+ , knownCompilers =
+ [ CompilerConfig
+ { compilerStyle = nhc98
+ , compilerPath = "/usr/bin/nhc98"
+ , compilerVersion = "v1.12"
+ , includePaths = ["/usr/include/nhc98"]
+ , cppSymbols = ["__NHC__"]
+ , extraCompilerFlags = []
+ , isHaskell98 = True
+ }
+ , CompilerConfig
+ { compilerStyle = nhc98
+ , compilerPath = "nhc98"
+ , compilerVersion = "v1.12"
+ , includePaths = ["/usr/include/nhc98"]
+ , cppSymbols = ["__NHC__"]
+ , extraCompilerFlags = []
+ , isHaskell98 = True
+ }
+ ]
+ }
diff --git a/dev-lang/nhc98/nhc98-1.12.ebuild b/dev-lang/nhc98/nhc98-1.12.ebuild
index 48f0f886a845..51376865cc17 100644
--- a/dev-lang/nhc98/nhc98-1.12.ebuild
+++ b/dev-lang/nhc98/nhc98-1.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nhc98/nhc98-1.12.ebuild,v 1.1 2002/06/09 07:38:07 george Exp $
+# /space/gentoo/cvsroot/gentoo-x86/dev-lang/nhc98/nhc98-1.12.ebuild,v 1.1 2002/06/09 07:38:07 george Exp
TARBALL=nhc98src-${PV}.tar.gz
@@ -21,7 +21,7 @@ src_unpack() {
src_compile() {
./configure --buildwith=gcc \
- --prefix=/usr \
+ --prefix=/usr --installdir=/usr \
-man -docs \
--buildopts="${CFLAGS} --host=${CHOST}" || die "./configure failed"
# the build does not seem to work all that
@@ -33,9 +33,15 @@ src_install () {
# The install location is taken care of by the
# configure script.
make DESTDIR=${D} install || die
+
+ #nhc has really weir configure system:
+ #it seems to setup hmakerc to point to the build position ignoring --prefix
+ #just need to copy a proper hmakerc over here
+ cd ${S}
+ MACHINE=`script/harch`
+ cp ${FILESDIR}/hmakerc ${D}/usr/lib/hmake/${MACHINE}/
#install docs and man pages manually
- cd ${S}
dodoc README INSTALL COPYRIGHT
doman man/*