From 80c02d59833ff59c8ed179a8f1f927e6b2d65bbf Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Sun, 28 Aug 1994 15:37:40 +0000
Subject: [PATCH] Use ${ECHO} instead of `echo' so that `make -s' is fairly
 quiet.

---
 share/mk/bsd.doc.mk |  6 +++---
 share/mk/bsd.lib.mk | 17 +++++++++--------
 share/mk/bsd.man.mk |  6 +++---
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
index 7df1d71882ca..55552f66f5f2 100644
--- a/share/mk/bsd.doc.mk
+++ b/share/mk/bsd.doc.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.doc.mk	5.3 (Berkeley) 1/2/91
-#	$Id: bsd.doc.mk,v 1.7 1994/04/19 17:15:55 jkh Exp $
+#	$Id: bsd.doc.mk,v 1.2 1994/08/04 21:09:22 wollman Exp $
 
 PRINTER?=	ps
 
@@ -39,7 +39,7 @@ obj:
 	here=`pwd`; subdir=`echo $$here | sed 's,^/usr/src/,,'`; \
 	if test $$here != $$subdir ; then \
 		dest=/usr/obj/$$subdir ; \
-		echo "$$here -> $$dest"; ln -s $$dest obj; \
+		${ECHO} "$$here -> $$dest"; ln -s $$dest obj; \
 		if test -d /usr/obj -a ! -d $$dest; then \
 			mkdir -p $$dest; \
 		else \
@@ -48,7 +48,7 @@ obj:
 	else \
 		true ; \
 		dest=$$here/obj ; \
-		echo "making $$here/obj" ; \
+		${ECHO} "making $$here/obj" ; \
 		if test ! -d obj ; then \
 			mkdir $$here/obj; \
 		fi ; \
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 09fa354fac58..2dad90714f56 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.lib.mk	5.26 (Berkeley) 5/2/91
-#	$Id: bsd.lib.mk,v 1.4 1994/08/10 02:48:07 wollman Exp $
+#	$Id: bsd.lib.mk,v 1.5 1994/08/26 18:58:10 wollman Exp $
 #
 
 .if exists(${.CURDIR}/../Makefile.inc)
@@ -15,6 +15,7 @@ SHLIB_MINOR != . ${.CURDIR}/shlib_version ; echo $$minor
 CFLAGS+= -I${DESTDIR}/usr/include
 CXXINCLUDES+= -I${DESTDIR}/usr/include/${CXX}
 .endif
+
 INSTALL?=	install
 LIBDIR?=	/usr/lib
 LINTLIBDIR?=	/usr/libdata/lint
@@ -138,14 +139,14 @@ all: ${_LIBS} # llib-l${LIB}.ln
 OBJS+=	${SRCS:N*.h:R:S/$/.o/g}
 
 lib${LIB}.a:: ${OBJS}
-	@echo building standard ${LIB} library
+	@${ECHO} building standard ${LIB} library
 	@rm -f lib${LIB}.a
 	@${AR} cTq lib${LIB}.a `lorder ${OBJS} | tsort` ${ARADD}
 	${RANLIB} lib${LIB}.a
 
 POBJS+=	${OBJS:.o=.po}
 lib${LIB}_p.a:: ${POBJS}
-	@echo building profiled ${LIB} library
+	@${ECHO} building profiled ${LIB} library
 	@rm -f lib${LIB}_p.a
 	@${AR} cTq lib${LIB}_p.a `lorder ${POBJS} | tsort` ${ARADD}
 	${RANLIB} lib${LIB}_p.a
@@ -160,14 +161,14 @@ SOBJS+= ${DESTDIR}/usr/lib/c++rt0.o
 
 SOBJS+= ${OBJS:.o=.so}
 lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: ${SOBJS}
-	@echo building shared ${LIB} library \(version ${SHLIB_MAJOR}.${SHLIB_MINOR}\)
+	@${ECHO} building shared ${LIB} library \(version ${SHLIB_MAJOR}.${SHLIB_MINOR}\)
 	@rm -f lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
-	@$(LD) -Bshareable \
+	@${LD} -Bshareable \
 	    -o lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
 	    ${SOBJS} ${LDDESTDIR} ${LDADD}
 
 lib${LIB}_pic.a:: ${SOBJS}
-	@echo building special pic ${LIB} library
+	@${ECHO} building special pic ${LIB} library
 	@rm -f lib${LIB}_pic.a
 	@${AR} cTq lib${LIB}_pic.a ${SOBJS} ${ARADD}
 	${RANLIB} lib${LIB}_pic.a
@@ -242,7 +243,7 @@ realinstall: beforeinstall
 		shift; \
 		t=${DESTDIR}$$1; \
 		shift; \
-		echo $$t -\> $$l; \
+		${ECHO} $$t -\> $$l; \
 		rm -f $$t; \
 		ln $$l $$t; \
 	done; true
@@ -279,7 +280,7 @@ obj:
 obj:
 	@cd ${.CURDIR}; rm -rf obj; \
 	here=`pwd`; dest=/usr/obj`echo $$here | sed 's,^/usr/src,,'`; \
-	echo "$$here -> $$dest"; ln -s $$dest obj; \
+	${ECHO} "$$here -> $$dest"; ln -s $$dest obj; \
 	if test -d /usr/obj -a ! -d $$dest; then \
 		mkdir -p $$dest; \
 	else \
diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
index 7836d0399948..17244f517ecf 100644
--- a/share/mk/bsd.man.mk
+++ b/share/mk/bsd.man.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.man.mk	5.2 (Berkeley) 5/11/90
-#	$Id: bsd.man.mk,v 1.6 1994/06/05 20:42:39 csgr Exp $
+#	$Id: bsd.man.mk,v 1.2 1994/08/04 21:09:24 wollman Exp $
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
@@ -63,7 +63,7 @@ maninstall: ${MANDEPEND}
 	while test $$# -ge 1; do					\
 		name=`${BASENAME} $$1`;					\
 		sect=`expr $$name : '.*\.\([^.]*\)'`;			\
-		echo "compressing in"					\
+		${ECHO} "compressing in"				\
 			"${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}:"	\
 			"$$name -> $${name}${ZEXT}";			\
 		${MCOMPRESS} ${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name ; \
@@ -94,7 +94,7 @@ maninstall: ${MANDEPEND}
 		sect=`expr $$name : '.*\.\([^.]*\)'`; \
 		dir=${DESTDIR}${MANDIR}$$sect; \
 		t=$${dir}${MANSUBDIR}/$$name; \
-		echo $${t}${ZEXT} -\> $${l}${ZEXT}; \
+		${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \
 		rm -f $${t}${ZEXTENSION}; \
 		rm -f $${t}; \
 		ln $${l}${ZEXT} $${t}${ZEXT}; \