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>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20011122174015.GA79172>