svn commit: r244071 - stable/9/etc

[Eitan Adler]

Author: eadler
Date: Mon Dec 10 02:40:08 2012
New Revision: 244071
URL: http://svnweb.freebsd.org/changeset/base/244071

Log:
  MFC r243101:
  	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
  Approved by:	cperciva (implicit)

Modified:
  stable/9/etc/Makefile
Directory Properties:
  stable/9/etc/   (props changed)

Modified: stable/9/etc/Makefile
==============================================================================
--- stable/9/etc/Makefile	Mon Dec 10 02:40:06 2012	(r244070)
+++ stable/9/etc/Makefile	Mon Dec 10 02:40:08 2012	(r244071)
@@ -217,8 +217,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
@@ -264,9 +263,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