d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Using set -x produces output on stderr instead of stdout.

Browse Source 
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
This commit is contained in:
eadler 2012-11-15 20:37:38 +00:00
parent 60660be432
commit 2a4f469096
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etc/Makefile
View File

@ -220,8 +220,7 @@ distribution:
cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0500 \ cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0500 \
${BSM_ETC_EXEC_FILES} ${BSM_ETC_DIR} ${BSM_ETC_EXEC_FILES} ${BSM_ETC_DIR}
.if ${MK_BIND_MTREE} != "no" .if ${MK_BIND_MTREE} != "no"
@if [ ! -e ${DESTDIR}/etc/namedb ]; then \ if [ ! -e ${DESTDIR}/etc/namedb ]; then \
set -x; \
ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \ ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \
fi fi
.endif .endif
@ -267,9 +266,8 @@ distribution:
.if ${MK_MAIL} != "no" .if ${MK_MAIL} != "no"
cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${ETCMAIL} ${DESTDIR}/etc/mail ${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 \ ! -f ${DESTDIR}/etc/aliases ]; then \
set -x; \
ln -s mail/aliases ${DESTDIR}/etc/aliases; \ ln -s mail/aliases ${DESTDIR}/etc/aliases; \
fi fi
.endif .endif