diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2017-03-04 11:31:08 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2017-03-04 11:31:08 +0000 |
| commit | caf42d812634461f3196797f55f320c03c49b019 (patch) | |
| tree | ba391a62595eca60b1465d596be86f96b094ef33 /bin | |
| parent | acc37ca1c15f7cd8b5e5b0389cf6e6b98ea61447 (diff) | |
| download | src-caf42d812634461f3196797f55f320c03c49b019.tar.gz src-caf42d812634461f3196797f55f320c03c49b019.zip | |
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
Notes
Notes:
svn path=/head/; revision=314655
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/csh/Makefile | 2 | ||||
| -rw-r--r-- | bin/df/Makefile | 2 | ||||
| -rw-r--r-- | bin/freebsd-version/Makefile | 2 | ||||
| -rw-r--r-- | bin/rmail/Makefile | 2 | ||||
| -rw-r--r-- | bin/sh/Makefile | 6 |
5 files changed, 7 insertions, 7 deletions
diff --git a/bin/csh/Makefile b/bin/csh/Makefile index e43de0770a56..4d5f3757eef0 100644 --- a/bin/csh/Makefile +++ b/bin/csh/Makefile @@ -9,7 +9,7 @@ .include <src.opts.mk> PACKAGE=runtime -TCSHDIR= ${.CURDIR}/../../contrib/tcsh +TCSHDIR= ${SRCTOP}/contrib/tcsh .PATH: ${TCSHDIR} PROG= csh diff --git a/bin/df/Makefile b/bin/df/Makefile index c054d29a27e8..6d36a370b02c 100644 --- a/bin/df/Makefile +++ b/bin/df/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PACKAGE=runtime -MOUNT= ${.CURDIR}/../../sbin/mount +MOUNT= ${SRCTOP}/sbin/mount .PATH: ${MOUNT} PROG= df diff --git a/bin/freebsd-version/Makefile b/bin/freebsd-version/Makefile index c49f66143b46..073f4d3fa00c 100644 --- a/bin/freebsd-version/Makefile +++ b/bin/freebsd-version/Makefile @@ -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}) ; \ diff --git a/bin/rmail/Makefile b/bin/rmail/Makefile index 53d0ca4f554f..21f3ceb16582 100644 --- a/bin/rmail/Makefile +++ b/bin/rmail/Makefile @@ -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... diff --git a/bin/sh/Makefile b/bin/sh/Makefile index ee7dc140e27c..65856de36491 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -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 |