d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid a install(1) crash by not using -C when the source is /dev/null

Browse Source 
Approved by:	allanjude (mentor)
Differential Revision:	https://reviews.freebsd.org/D16476
This commit is contained in:
brd 2018-07-27 22:46:42 +00:00
parent 4efcd8fff4
commit 47affdf8b0
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
share/mk/bsd.confs.mk
View File

@ -107,6 +107,12 @@ ${group}NAME_${cnf}?= ${${group}NAME}
${group}NAME_${cnf}?= ${cnf:T}
. endif # defined(${group}NAME)
# Work around a bug with install(1) -C and /dev/null
. if ${cnf} == "/dev/null"
INSTALL_COPY=
. else
INSTALL_COPY= -C
. endif
STAGE_AS_SETS+= ${cnf:T}
STAGE_AS_${cnf:T}= ${${group}NAME_${cnf:T}}
@ -116,7 +122,7 @@ stage_as.${cnf:T}: ${cnf}
realinstallconfig: installdirs-${_${group}DIR_${cnf}} _${group}INS_${cnf:T}
_${group}INS_${cnf:T}: ${cnf}
${INSTALL} ${${group}TAG_ARGS} -C -o ${${group}OWN_${cnf}} \
${INSTALL} ${${group}TAG_ARGS} ${INSTALL_COPY} -o ${${group}OWN_${cnf}} \
-g ${${group}GRP_${cnf}} -m ${${group}MODE_${cnf}} \
${.ALLSRC} ${${group}PREFIX_${cnf}}/${${group}NAME_${cnf}}
. endfor # for cnf in ${${group}}