summaryrefslogtreecommitdiff
path: root/mk/build
diff options
context:
space:
mode:
Diffstat (limited to 'mk/build')
-rw-r--r--mk/build/bsd.build-vars.mk3
-rw-r--r--mk/build/build.mk6
-rw-r--r--mk/build/test.mk4
3 files changed, 7 insertions, 6 deletions
diff --git a/mk/build/bsd.build-vars.mk b/mk/build/bsd.build-vars.mk
index 2c7279a12f8..fe63c62a338 100644
--- a/mk/build/bsd.build-vars.mk
+++ b/mk/build/bsd.build-vars.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.build-vars.mk,v 1.6 2010/02/01 00:16:54 joerg Exp $
+# $NetBSD: bsd.build-vars.mk,v 1.7 2011/09/08 20:17:15 abs Exp $
#
# Package-settable variables:
#
@@ -52,3 +52,4 @@ MAKE_ENV+= ${USETOOLS:DUSETOOLS=${USETOOLS:Q}}
# processes for build-related phases.
#
PKGSRC_MAKE_ENV+= PATH=${PATH:Q}
+PKGSRC_MAKE_ENV+= USE_DESTDIR=${USE_DESTDIR:Q}
diff --git a/mk/build/build.mk b/mk/build/build.mk
index 28795814f2a..ce530f8a904 100644
--- a/mk/build/build.mk
+++ b/mk/build/build.mk
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.19 2009/01/10 15:59:29 tnn Exp $
+# $NetBSD: build.mk,v 1.20 2011/09/08 20:17:15 abs Exp $
#
# This file defines what happens in the build phase, excluding the
# self-test, which is defined in test.mk.
@@ -46,7 +46,7 @@ BUILD_MAKE_FLAGS?= # none
BUILD_TARGET?= all
BUILD_MAKE_CMD= \
- ${SETENV} ${MAKE_ENV} \
+ ${PKGSRC_SETENV} ${MAKE_ENV} \
${MAKE_PROGRAM} ${_MAKE_JOBS} \
${MAKE_FLAGS} ${BUILD_MAKE_FLAGS} \
-f ${MAKE_FILE}
@@ -163,7 +163,7 @@ BUILD_ENV_SHELL?= ${SH}
build-env: .PHONY configure
@${STEP_MSG} "Entering the build environment for ${PKGNAME}"
${RUN}${_ULIMIT_CMD} \
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${BUILD_ENV_SHELL}
+ cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ${BUILD_ENV_SHELL}
.else
build-env: barrier
.endif
diff --git a/mk/build/test.mk b/mk/build/test.mk
index a0dffdcc4ae..59e60cc89ab 100644
--- a/mk/build/test.mk
+++ b/mk/build/test.mk
@@ -1,4 +1,4 @@
-# $NetBSD: test.mk,v 1.15 2008/11/05 23:44:55 rillig Exp $
+# $NetBSD: test.mk,v 1.16 2011/09/08 20:17:15 abs Exp $
#
# After the "build" phase, many packages provide some sort of self-test
# that can be run on the not-yet installed package. To enable these
@@ -47,7 +47,7 @@ TEST_ENV+= ${MAKE_ENV}
TEST_MAKE_FLAGS?= # none
TEST_MAKE_CMD= \
- ${SETENV} ${MAKE_ENV} \
+ ${PKGSRC_SETENV} ${MAKE_ENV} \
${MAKE_PROGRAM} ${MAKE_FLAGS} ${TEST_MAKE_FLAGS} \
-f ${MAKE_FILE}