From a329641dc45ca1197545a0b1e22da88921e35495 Mon Sep 17 00:00:00 2001
From: pgj <pgj@FreeBSD.org>
Date: Sun, 8 Nov 2009 19:40:06 +0000
Subject: - Fix installation of hs-ghc-paths as slave port when build is
 launched in   user mode.

PR:		ports/140269
Submitted by:	Makoto Kishimoto <ksmakoto(at)dd(dot)iij4u(dot)or(dot)jp>
---
 lang/ghc/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index a06fb0ad9eae..8cec1fe4920e 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -181,7 +181,7 @@ MAN1=		ghc.1
 
 SLAVES_PREFIX=		${WRKDIR}/slaves_prefix
 SLAVES_WRKDIRPREFIX=	${WRKDIR}/slaves_wrkdirprefix
-SLAVES_MAKE_ARGS=	-DSLAVE PREFIX=${SLAVES_PREFIX} WRKDIRPREFIX=${SLAVES_WRKDIRPREFIX}
+SLAVES_MAKE_ARGS=	-DSLAVE PREFIX=${SLAVES_PREFIX} WRKDIRPREFIX=${SLAVES_WRKDIRPREFIX} PATH=${BOOT_DIR}/bin:${PATH}
 
 MAKE_ENV+=	PATH=${SLAVES_PREFIX}/bin:${PATH}
 CONFIGURE_ENV+=	PATH=${SLAVES_PREFIX}/bin:${PATH}
@@ -273,14 +273,14 @@ pre-configure:
 
 .if defined(WITHOUT_HADDOCK)
 	@(cd ${PORTSDIR}/devel/hs-ghc-paths && \
-		${SETENV} PATH=${BOOT_DIR}/bin:${PATH} ${MAKE} ${SLAVES_MAKE_ARGS} install)
+		${MAKE} ${SLAVES_MAKE_ARGS} install)
 
 	@(cd ${PORTSDIR}/devel/hs-haddock && \
-		${SETENV} PATH=${BOOT_DIR}/bin:${PATH} ${MAKE} ${SLAVES_MAKE_ARGS} install)
+		${MAKE} ${SLAVES_MAKE_ARGS} install)
 .endif
 
 	@(cd ${PORTSDIR}/print/hs-hscolour && \
-		${SETENV} PATH=${BOOT_DIR}/bin:${PATH} ${MAKE} ${SLAVES_MAKE_ARGS} install)
+		${MAKE} ${SLAVES_MAKE_ARGS} install)
 .endif
 
 post-install:
-- 
cgit