From owner-svn-src-all@freebsd.org Mon Nov 5 21:30:01 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 360B3110C4A9; Mon, 5 Nov 2018 21:30:01 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id ADDCD73D18; Mon, 5 Nov 2018 21:30:00 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 905401D0B9; Mon, 5 Nov 2018 21:30:00 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA5LU04n039981; Mon, 5 Nov 2018 21:30:00 GMT (envelope-from arichardson@FreeBSD.org) Received: (from arichardson@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA5LU0X3039980; Mon, 5 Nov 2018 21:30:00 GMT (envelope-from arichardson@FreeBSD.org) Message-Id: <201811052130.wA5LU0X3039980@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arichardson set sender to arichardson@FreeBSD.org using -f From: Alex Richardson Date: Mon, 5 Nov 2018 21:30:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340162 - head/tools/build X-SVN-Group: head X-SVN-Commit-Author: arichardson X-SVN-Commit-Paths: head/tools/build X-SVN-Commit-Revision: 340162 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: ADDCD73D18 X-Spamd-Result: default: False [-101.79 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.79)[-0.786,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.89)[-0.895,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Nov 2018 21:30:01 -0000 Author: arichardson Date: Mon Nov 5 21:30:00 2018 New Revision: 340162 URL: https://svnweb.freebsd.org/changeset/base/340162 Log: Fix -DNO_CLEAN build after r340157 Approved By: jhb (mentor) Modified: head/tools/build/Makefile Modified: head/tools/build/Makefile ============================================================================== --- head/tools/build/Makefile Mon Nov 5 21:28:32 2018 (r340161) +++ head/tools/build/Makefile Mon Nov 5 21:30:00 2018 (r340162) @@ -114,9 +114,17 @@ installdirs: # bootstrap-tools phase. We could also overrride BINDIR when building bootstrap # tools but adding the symlinks is easier and means all tools are also # in the directory that they are installed to normally. - ln -sf bin ${DESTDIR}/sbin - ln -sf ../bin ${DESTDIR}/usr/bin - ln -sf ../bin ${DESTDIR}/usr/sbin + +.for _dir in sbin usr/sbin usr/bin +# delete existing directories from before r340157 + @if [ ! -L ${DESTDIR}/${_dir} ]; then \ + echo "removing old non-symlink ${DESTDIR}/${_dir}"; \ + rm -rf "${DESTDIR}/${_dir}"; \ + fi +.endfor + ln -sfn bin ${DESTDIR}/sbin + ln -sfn ../bin ${DESTDIR}/usr/bin + ln -sfn ../bin ${DESTDIR}/usr/sbin .for _group in ${INCSGROUPS:NINCS} mkdir -p "${DESTDIR}/${${_group}DIR}" .endfor