diff options
| author | rillig <rillig> | 2005-11-15 16:29:10 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2005-11-15 16:29:10 +0000 |
| commit | f88001fed395c4d613705b6b1d25eacd3e3797e4 (patch) | |
| tree | 4aa43240098571ab1be7f223d1d96eb1ef885959 | |
| parent | c53c8ebbb3a09a6aa20d07c8222b8e95eade1d97 (diff) | |
| download | pkgsrc-f88001fed395c4d613705b6b1d25eacd3e3797e4.tar.gz | |
Allow white-space in the PATH environment variable. Fixes PR 32079. The
shell quoting still isn't completely correct for some other variables.
This needs to be fixed, too.
| -rw-r--r-- | mk/bsd.pkg.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index c0f51edda26..534137cc77e 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1748 2005/11/14 04:41:17 rillig Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1749 2005/11/15 16:29:10 rillig Exp $ # # This file is in the public domain. # @@ -2523,7 +2523,7 @@ show-shlib-type: sotype=none; \ if [ "X${MKPIC}" != "Xno" -a "X${NOPIC}" = "X" ]; then \ ${ECHO} "int main() { return(0); }" > a.$$$$.c; \ - ${SETENV} PATH=${PATH} \ + ${SETENV} PATH=${PATH:Q} \ ${CC} ${CFLAGS} a.$$$$.c -o a.$$$$.out; \ case `${FILE_CMD} a.$$$$.out` in \ *ELF*dynamically*) \ @@ -2814,7 +2814,7 @@ _SU_TARGET= \ fi; \ ${ECHO_MSG} "${_PKGSRC_IN}> Becoming ${ROOT_USER}@`${HOSTNAME_CMD}` to $$action ${PKGBASE}."; \ ${ECHO_N} "`${ECHO} ${SU_CMD} | ${AWK} '{ print $$1 }'` ";\ - ${SU_CMD} "cd ${.CURDIR}; ${SETENV} PATH=$${PATH}:${SU_CMD_PATH_APPEND} ${MAKE} $$args ${MAKEFLAGS} $$realtarget $$realflags"; \ + ${SU_CMD} 'cd ${.CURDIR}; path=$${PATH}:${SU_CMD_PATH_APPEND:Q}; ${SETENV} PATH="$${path}" ${MAKE} '"$$args"' ${MAKEFLAGS} '"$$realtarget"' '"$$realflags"''; \ fi .PHONY: do-su-install |