From owner-svn-src-head@freebsd.org Sat Mar 4 11:31:10 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 90F7ECF98D4; Sat, 4 Mar 2017 11:31:10 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 481221C2D; Sat, 4 Mar 2017 11:31:10 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v24BV9D7031750; Sat, 4 Mar 2017 11:31:09 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24BV8Hd031744; Sat, 4 Mar 2017 11:31:08 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703041131.v24BV8Hd031744@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sat, 4 Mar 2017 11:31:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314655 - in head/bin: csh df freebsd-version rmail sh X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 11:31:10 -0000 Author: ngie Date: Sat Mar 4 11:31:08 2017 New Revision: 314655 URL: https://svnweb.freebsd.org/changeset/base/314655 Log: bin: normalize paths using SRCTOP-relative paths or :H when possible This simplifies make logic/output MFC after: 1 month Sponsored by: Dell EMC Isilon Modified: head/bin/csh/Makefile head/bin/df/Makefile head/bin/freebsd-version/Makefile head/bin/rmail/Makefile head/bin/sh/Makefile Modified: head/bin/csh/Makefile ============================================================================== --- head/bin/csh/Makefile Sat Mar 4 11:30:04 2017 (r314654) +++ head/bin/csh/Makefile Sat Mar 4 11:31:08 2017 (r314655) @@ -9,7 +9,7 @@ .include PACKAGE=runtime -TCSHDIR= ${.CURDIR}/../../contrib/tcsh +TCSHDIR= ${SRCTOP}/contrib/tcsh .PATH: ${TCSHDIR} PROG= csh Modified: head/bin/df/Makefile ============================================================================== --- head/bin/df/Makefile Sat Mar 4 11:30:04 2017 (r314654) +++ head/bin/df/Makefile Sat Mar 4 11:31:08 2017 (r314655) @@ -2,7 +2,7 @@ # $FreeBSD$ PACKAGE=runtime -MOUNT= ${.CURDIR}/../../sbin/mount +MOUNT= ${SRCTOP}/sbin/mount .PATH: ${MOUNT} PROG= df Modified: head/bin/freebsd-version/Makefile ============================================================================== --- head/bin/freebsd-version/Makefile Sat Mar 4 11:30:04 2017 (r314654) +++ head/bin/freebsd-version/Makefile Sat Mar 4 11:31:08 2017 (r314655) @@ -4,7 +4,7 @@ PACKAGE=runtime SCRIPTS = freebsd-version MAN = freebsd-version.1 CLEANFILES = freebsd-version freebsd-version.sh -NEWVERS = ${.CURDIR}/../../sys/conf/newvers.sh +NEWVERS = ${SRCTOP}/sys/conf/newvers.sh freebsd-version.sh: ${.CURDIR}/freebsd-version.sh.in ${NEWVERS} eval $$(egrep '^(TYPE|REVISION|BRANCH)=' ${NEWVERS}) ; \ Modified: head/bin/rmail/Makefile ============================================================================== --- head/bin/rmail/Makefile Sat Mar 4 11:30:04 2017 (r314654) +++ head/bin/rmail/Makefile Sat Mar 4 11:31:08 2017 (r314655) @@ -2,7 +2,7 @@ # $FreeBSD$ PACKAGE=sendmail -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail +SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/rmail # Not much point this being static. It calls a shared sendmail... Modified: head/bin/sh/Makefile ============================================================================== --- head/bin/sh/Makefile Sat Mar 4 11:30:04 2017 (r314654) +++ head/bin/sh/Makefile Sat Mar 4 11:31:08 2017 (r314655) @@ -28,9 +28,9 @@ WARNS?= 2 WFORMAT=0 .PATH: ${.CURDIR}/bltin \ - ${.CURDIR}/../kill \ - ${.CURDIR}/../test \ - ${.CURDIR}/../../usr.bin/printf + ${.CURDIR:H}/kill \ + ${.CURDIR:H}/test \ + ${SRCTOP}/usr.bin/printf CLEANFILES+= mknodes mknodes.o \ mksyntax mksyntax.o