svn commit: r314655 - in head/bin: csh df freebsd-version rmail sh

[Ngie Cooper]

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 <src.opts.mk>
 
 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