svn commit: r243101 - head/etc

[Eitan Adler]

Author: eadler
Date: Thu Nov 15 20:37:38 2012
New Revision: 243101
URL: http://svnweb.freebsd.org/changeset/base/243101

Log:
  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 at skoberne.net>
  Submitted by:	bdrewery
  Approved by:	cperciva
  MFC after:	1 week

Modified:
  head/etc/Makefile

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Thu Nov 15 20:25:09 2012	(r243100)
+++ head/etc/Makefile	Thu Nov 15 20:37:38 2012	(r243101)
@@ -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