summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorcjep <cjep@pkgsrc.org>2002-07-23 19:10:27 +0000
committercjep <cjep@pkgsrc.org>2002-07-23 19:10:27 +0000
commitbb81429b52b2974cc0a89d4c4c7d25fcce81edaa (patch)
treef7ec302d99eecc2508274e23eeebdc3b805c017d /mk
parent0b0842b15fb52dc823d73b435c84c23df16e2d73 (diff)
downloadpkgsrc-bb81429b52b2974cc0a89d4c4c7d25fcce81edaa.tar.gz
Add a variable SU_CMD_PATH_APPEND containing a colon separated list of
directories. When ${SU_CMD} is used, we add this list to the end of the PATH environment variable. This fixes PR#17532 from Hauke Fath.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.defaults.mk7
-rw-r--r--mk/bsd.pkg.mk4
2 files changed, 8 insertions, 3 deletions
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk
index 29d06fb87f2..9a0fd81b38c 100644
--- a/mk/bsd.pkg.defaults.mk
+++ b/mk/bsd.pkg.defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.73 2002/07/22 17:20:06 cjep Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.74 2002/07/23 19:10:27 cjep Exp $
#
# A file providing defaults for pkgsrc and the packages collection.
@@ -335,6 +335,11 @@ SU_CMD?= ${ROOT_CMD}
# Possible: su, sudo, or priv, with appropriate arguments
# Default: dependent on operating system. For NetBSD: ${SU} - root -c
+SU_CMD_PATH_APPEND?=/sbin:/usr/sbin
+# Additional directories (in a colon separated list) to be added to the
+# PATH environment variable when running ${SU_CMD}.
+# Default: /sbin:/usr/sbin
+
FATAL_OBJECT_FMT_SKEW?=yes
# If there is a pre-requisite package, which has a different object format
# from that currently being used, halt execution. One (rare) situation where
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 9cbfa7d0b10..5c233ee8568 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1011 2002/07/22 22:00:49 jlam Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1012 2002/07/23 19:10:27 cjep Exp $
#
# This file is in the public domain.
#
@@ -2609,7 +2609,7 @@ _SU_TARGET= \
fi; \
${ECHO_MSG} "${_PKGSRC_IN}> Becoming root@`/bin/hostname` to $$action ${PKGNAME}."; \
${ECHO_MSG} -n "`${ECHO} ${SU_CMD} | ${AWK} '{ print $$1 }'` ";\
- ${SU_CMD} "cd ${.CURDIR}; ${MAKE} $$args ${MAKEFLAGS} $$realtarget $$realflags"; \
+ ${SU_CMD} "cd ${.CURDIR}; ${SETENV} PATH=$${PATH}:${SU_CMD_PATH_APPEND} ${MAKE} $$args ${MAKEFLAGS} $$realtarget $$realflags"; \
fi
do-su-install: