Mon Sep 2 02:59:48 2019 UTC ()
mk/build: in build-env, output BUILD_DIRS relative to WRKSRC


(rillig)
diff -r1.27 -r1.28 pkgsrc/mk/build/build.mk

cvs diff -r1.27 -r1.28 pkgsrc/mk/build/build.mk (expand / switch to context diff)
--- pkgsrc/mk/build/build.mk 2019/09/02 02:54:57 1.27
+++ pkgsrc/mk/build/build.mk 2019/09/02 02:59:47 1.28
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.27 2019/09/02 02:54:57 rillig Exp $
+# $NetBSD: build.mk,v 1.28 2019/09/02 02:59:47 rillig Exp $
 #
 # This file defines what happens in the build phase, excluding the
 # self-test, which is defined in test.mk.
@@ -203,8 +203,9 @@
 build-env: .PHONY ${_PKGSRC_BARRIER:Ubarrier:D_build-env}
 _build-env: .PHONY configure
 	@${STEP_MSG} "Entering the build environment for ${PKGNAME}"
-.if ${BUILD_DIRS:[#]} > 1
-	@${ECHO_MSG} "The BUILD_DIRS are: "${BUILD_DIRS:Q}
+.if ${BUILD_DIRS:[#]} > 1 || ${BUILD_DIRS} != ${WRKSRC}
+	@${ECHO_MSG} "The BUILD_DIRS are:" \
+		${BUILD_DIRS:S,^${WRKSRC}$,.,:S,^${WRKSRC}/,,:Q}
 .endif
 	${RUN}${_ULIMIT_CMD}						\
 	cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ${BUILD_ENV_SHELL}