diff options
| author | eadler <eadler@FreeBSD.org> | 2012-11-15 20:37:38 +0000 |
|---|---|---|
| committer | eadler <eadler@FreeBSD.org> | 2012-11-15 20:37:38 +0000 |
| commit | 2a4f469096a25835b0facb5b8714c175ac220b9b (patch) | |
| tree | 58d71be776f088b138627d582450fab9ff25fcde | |
| parent | 60660be432214047997de3bcadc94707bfbb51e4 (diff) | |
| download | FreeBSD-src-2a4f469096a25835b0facb5b8714c175ac220b9b.zip FreeBSD-src-2a4f469096a25835b0facb5b8714c175ac220b9b.tar.gz | |
Using set -x produces output on stderr instead of stdout.
It also doesn't work with make -s.
Prefer the use of builtin make features.
PR: misc/126312
Reported by: Nejc Skoberne <nejc@skoberne.net>
Submitted by: bdrewery
Approved by: cperciva
MFC after: 1 week
| -rw-r--r-- | etc/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/etc/Makefile b/etc/Makefile index bbb5018..c18908f 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -220,8 +220,7 @@ distribution: cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0500 \ ${BSM_ETC_EXEC_FILES} ${BSM_ETC_DIR} .if ${MK_BIND_MTREE} != "no" - @if [ ! -e ${DESTDIR}/etc/namedb ]; then \ - set -x; \ + if [ ! -e ${DESTDIR}/etc/namedb ]; then \ ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \ fi .endif @@ -267,9 +266,8 @@ distribution: .if ${MK_MAIL} != "no" cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${ETCMAIL} ${DESTDIR}/etc/mail - @if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/mail/aliases -a \ + if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/mail/aliases -a \ ! -f ${DESTDIR}/etc/aliases ]; then \ - set -x; \ ln -s mail/aliases ${DESTDIR}/etc/aliases; \ fi .endif |
