Date: Mon, 26 Nov 2001 15:13:36 +0100 From: Martijn Lina <martijn@medialab.lostboys.nl> To: Kris Kennaway <kris@obsecurity.org> Cc: freebsd-ports@freebsd.org Subject: Re: WRKDIRPREFIX problem Message-ID: <20011126141336.GA65333@drain.ietsvaags.xs4all.nl> In-Reply-To: <20011126125840.GA57608@drain.ietsvaags.xs4all.nl> References: <20011122174015.GA79172@drain.ietsvaags.xs4all.nl> <20011125151839.E93796@xor.obsecurity.org> <20011126125840.GA57608@drain.ietsvaags.xs4all.nl>
next in thread | previous in thread | raw e-mail | index | archive | help
Once upon a 26-11-2001, martijn hit keys in the following order: > > here's a new and better patch implementing all this. aargh, pressed sent to quick and the second line of the warning didn't really make sense (drank too much of those ramdom-keystroke-generators yesterday). here's a better one: --- bsd.port.mk.orig Mon Nov 26 13:56:08 2001 +++ bsd.port.mk Mon Nov 26 14:38:12 2001 @@ -992,8 +992,11 @@ .endif MD5_FILE?= ${MASTERDIR}/distinfo +.if ${MAKEFILE} != "Makefile" +MAKE_FILE= ${MAKEFILE} +.endif MAKE_FLAGS?= -f -MAKEFILE?= Makefile +MAKE_FILE?= Makefile MAKE_ENV+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" .if ${OSVERSION} < 500016 @@ -1886,9 +1889,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} ${MAKE_FILE} ${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} ${MAKE_FILE} ${MAKE_ARGS} ${ALL_TARGET}) .endif .endif @@ -1897,14 +1900,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} ${MAKE_FILE} ${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} ${MAKE_FILE} ${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} ${MAKE_FILE} ${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} ${MAKE_FILE} ${MAKE_ARGS} install.man) .endif .endif .endif @@ -2101,6 +2104,10 @@ .if !target(fetch) fetch: pre-everything +.if ${MAKEFILE} != "Makefile" + @${ECHO_MSG} "===> Warning: This port uses MAKEFILE which should be renamed to MAKE_FILE." + @${ECHO_MSG} " MAKE_FILE has been set to ${MAKEFILE}." +.endif @cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} real-fetch .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?20011126141336.GA65333>