X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=f46f665c94c43baa2488e9263498616d4033726e;hb=c5dc265a067a286da2f988ddb58c8f8bc33e80a0;hp=492c75576e76fec883f2f50769a41bd604b80d9a;hpb=fbb2c958f52fcba4b5324dee8a33fa6298b94848;p=pkgsrc-ghc.git

diff --git a/Makefile b/Makefile
index 492c755..f46f665 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 DISTNAME=		ghc-${VERSION}
 VERSION=		7.0.1
 CATEGORIES=		lang
-MASTER_SITES=	http://new-www.haskell.org/ghc/dist/${VERSION}/
+MASTER_SITES=	http://www.haskell.org/ghc/dist/${VERSION}/
 MAINTAINER=		kristerw@NetBSD.org
 HOMEPAGE=		http://www.haskell.org/ghc/
 COMMENT=		Compiler for the functional language Haskell
@@ -149,13 +149,9 @@ ${WRKDIR}/stamp-bootstrap-ghc: ${WRKDIR}/stamp-rewrite-hc-paths
 do-configure:
 	${RUN} cd ${WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS}
-# We need to tell the libraries/integer-gmp/configure that libgmp is
+# We need to tell the libraries/terminfo/configure that our ncurses is
 # in a non-standard path. Without that, the resulting GHC tries to
 # link programs by executing ld(1) without passing it -L${PREFIX}/lib.
-	${RUN} ${ECHO} "libraries/integer-gmp_CONFIGURE_OPTS += \
-		--configure-option=--with-gmp-includes=${PREFIX}/include \
-		--configure-option=--with-gmp-libraries=${PREFIX}/lib" > ${WRKSRC}/mk/build.mk
-# The ncurses is also in a non-standard path.
 	${RUN} ${ECHO} "libraries/terminfo_CONFIGURE_OPTS += \
 		--configure-option=--with-curses-includes=${PREFIX}/include \
 		--configure-option=--with-curses-libraries=${PREFIX}/lib" >> ${WRKSRC}/mk/build.mk
@@ -178,6 +174,9 @@ do-configure:
 #	${RUN} ${ECHO} "GhcRtsCcOpts = -O0 -g" >> ${WRKSRC}/mk/build.mk
 #.endif
 
+# Substitutions for INSTALL and DEINSTALL.
+FILES_SUBST+=	DISTNAME=${DISTNAME}
+
 # Some unused scripts don't pass the portability test.
 CHECK_PORTABILITY_SKIP+=	distrib/prep-bin-dist-mingw