svn commit: r338363 - head

[Li-Wen Hsu]

Author: lwhsu
Date: Tue Aug 28 23:56:52 2018
New Revision: 338363
URL: https://svnweb.freebsd.org/changeset/base/338363

Log:
  Fix 'install: symlink usr/src/sys -> /sys: File exists' in distributeworld
  
  Follow r334617, specify ${DISTDIR} (by ${INSTALL_DDIR}), '/base' and add
  ${INSTALLFLAGS} while installing the '/sys' symbolic link.
  
  Reviewed by:	bapt (earlier version), markj
  Approved by:	re (gjb), markj (mentor)
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D16877

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Aug 28 22:51:45 2018	(r338362)
+++ head/Makefile.inc1	Tue Aug 28 23:56:52 2018	(r338363)
@@ -1334,7 +1334,7 @@ distributeworld installworld stageworld: _installcheck
 	    METALOG=${METALOG} ${IMAKE_INSTALL} ${IMAKE_MTREE} \
 	    DISTBASE=/base DESTDIR=${DESTDIR}/${DISTDIR}/base \
 	    LOCAL_MTREE=${LOCAL_MTREE:Q} distrib-dirs
-	${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys
+	${INSTALL_SYMLINK} ${INSTALLFLAGS} usr/src/sys ${INSTALL_DDIR}/base/sys
 .endif
 	${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
 	    ${IMAKEENV} rm -rf ${INSTALLTMP}