svn commit: r336794 - head/share/mk

[Brad Davis]

Author: brd
Date: Fri Jul 27 22:46:42 2018
New Revision: 336794
URL: https://svnweb.freebsd.org/changeset/base/336794

Log:
  Avoid a install(1) crash by not using -C when the source is /dev/null
  
  Approved by:	allanjude (mentor)
  Differential Revision:	https://reviews.freebsd.org/D16476

Modified:
  head/share/mk/bsd.confs.mk

Modified: head/share/mk/bsd.confs.mk
==============================================================================
--- head/share/mk/bsd.confs.mk	Fri Jul 27 22:35:07 2018	(r336793)
+++ head/share/mk/bsd.confs.mk	Fri Jul 27 22:46:42 2018	(r336794)
@@ -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}}