CVS commit: pkgsrc/mk/build

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Mon Sep  2 02:59:48 UTC 2019

Modified Files:
        pkgsrc/mk/build: build.mk

Log Message:
mk/build: in build-env, output BUILD_DIRS relative to WRKSRC


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/mk/build/build.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/build/build.mk
diff -u pkgsrc/mk/build/build.mk:1.27 pkgsrc/mk/build/build.mk:1.28
--- pkgsrc/mk/build/build.mk:1.27       Mon Sep  2 02:54:57 2019
+++ pkgsrc/mk/build/build.mk    Mon Sep  2 02:59:47 2019
@@ -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_SHELL?=   ${SH}
 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}