Date: Mon, 10 May 2004 02:40:27 +0200 From: Oliver Eikemeier <eikemeier@fillmore-labs.com> To: Kris Kennaway <kris@obsecurity.org> Cc: Garance A Drosihn <drosih@rpi.edu> Subject: Re: Make index || portsdb -uU fails after cvsup Message-ID: <409ECF7B.5090606@fillmore-labs.com> In-Reply-To: <20040509231911.GA54086@xor.obsecurity.org> References: <BCC2AE80.128AC%tomonage2@gmx.de> <20040508134709.GA35555@xor.obsecurity.org> <p0602040fbcc33d188518@[128.113.24.47]> <20040509024226.GA79746@xor.obsecurity.org> <p06020411bcc4683ea298@[128.113.24.47]> <20040509231911.GA54086@xor.obsecurity.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Kris Kennaway wrote:
> The existence of /usr/obj/usr/ports seems to confuse ports.
This stems from the fact that make has `pwd` != ${.CURDIR} when
/usr/obj/`pwd` exists, see make(1).
This patch fixes the problems for `make index':
diff -u -r1.53 bsd.port.subdir.mk
--- bsd.port.subdir.mk 2 Apr 2004 07:25:23 -0000 1.53
+++ bsd.port.subdir.mk 10 May 2004 00:27:11 -0000
@@ -209,7 +213,7 @@
.for i in ${SUBDIR}
describe.$i:
- @${MAKE} -B ${i:S/^/_/:S/$/.describe/} > ${INDEX_TMPDIR}/${INDEXFILE}.desc.${i}
+ @cd ${.CURDIR}; ${MAKE} -B ${i:S/^/_/:S/$/.describe/} > ${INDEX_TMPDIR}/${INDEXFILE}.desc.${i}
.endfor
.else
describe: ${SUBDIR:S/^/_/:S/$/.describe/}
while I'm here, may I humbly as for:
diff -u -r1.53 bsd.port.subdir.mk
--- bsd.port.subdir.mk 2 Apr 2004 07:25:23 -0000 1.53
+++ bsd.port.subdir.mk 10 May 2004 00:27:11 -0000
@@ -82,6 +81,11 @@
ECHO_MSG?= echo
+# local customization of the ports tree
+.if exists(${.CURDIR}/Makefile.local)
+.include "${.CURDIR}/Makefile.local"
+.endif
+
TARGETS+= all
TARGETS+= build
TARGETS+= checksum
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?409ECF7B.5090606>