From owner-freebsd-ports  Thu Nov 22  9:40:21 2001
Delivered-To: freebsd-ports@freebsd.org
Received: from smtpzilla1.xs4all.nl (smtpzilla1.xs4all.nl [194.109.127.137])
	by hub.freebsd.org (Postfix) with ESMTP id F124637B418
	for <freebsd-ports@freebsd.org>; Thu, 22 Nov 2001 09:40:17 -0800 (PST)
Received: from drain.ietsvaags.xs4all.nl (ietsvaags.xs4all.nl [213.84.71.76])
	by smtpzilla1.xs4all.nl (8.12.0/8.12.0) with ESMTP id fAMHeGr7005751
	for <freebsd-ports@freebsd.org>; Thu, 22 Nov 2001 18:40:16 +0100 (CET)
Received: by drain.ietsvaags.xs4all.nl (Postfix, from userid 1000)
	id BE6DA674; Thu, 22 Nov 2001 18:40:15 +0100 (CET)
Date: Thu, 22 Nov 2001 18:40:15 +0100
From: Martijn Lina <mlina@dds.nl>
To: freebsd-ports@freebsd.org
Subject: WRKDIRPREFIX problem
Message-ID: <20011122174015.GA79172@drain.ietsvaags.xs4all.nl>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.3.23.2i
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-ports.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-ports>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-ports>
X-Loop: FreeBSD.org

hi,

today i cvsupped to the latest 4.4-STABLE branch and something with
/usr/bin/make has changed, i think. My ports dir gets mounted via NFS, and
therefor i use WRKDIRPREFIX=/usr/obj to be able to build parallel on several
machines (and that's a good thing when doing a make clean). Somehow MAKEFILE is
set to the full path within the ports collection, instead of to the place in
WRKDIRPREFIX. I made diff to fix it, but it might break all ports that set
MAKEFILE.

maybe there's something i overlooked though...

martijn


--- bsd.port.mk.orig	Thu Nov 22 17:54:17 2001
+++ bsd.port.mk	Thu Nov 22 17:56:33 2001
@@ -994,6 +994,7 @@
 
 MAKE_FLAGS?=	-f
 MAKEFILE?=		Makefile
+BUILD_MAKEFILE?=	Makefile
 MAKE_ENV+=		PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
 
 .if ${OSVERSION} < 500016
@@ -1886,9 +1887,9 @@
 .if !target(do-build)
 do-build:
 .if defined(USE_GMAKE)
-	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${BUILD_MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 .else
-	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${BUILD_MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 .endif
 .endif
 
@@ -1897,14 +1898,14 @@
 .if !target(do-install)
 do-install:
 .if defined(USE_GMAKE)
-	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${BUILD_MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 .if defined(USE_IMAKE) && !defined(NO_INSTALL_MANPAGES)
-	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install.man)
+	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${BUILD_MAKEFILE} ${MAKE_ARGS} install.man)
 .endif
 .else defined(USE_GMAKE)
-	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${BUILD_MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 .if defined(USE_IMAKE) && !defined(NO_INSTALL_MANPAGES)
-	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install.man)
+	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${BUILD_MAKEFILE} ${MAKE_ARGS} install.man)
 .endif
 .endif
 .endif

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message