From 6e1ed39e5d655cbe6a2259860f9ae1f243ee7a5b Mon Sep 17 00:00:00 2001
From: tron <tron@pkgsrc.org>
Date: Wed, 7 Jun 2006 10:04:03 +0000
Subject: 1.) Remove all instances of '@${WARNING_MSG} "Warning: ...' which
 resulted     in error message like 'WARNING: Warning: ...'. 2.) Replace
 "WARN_MSG" with "WARNING_MSG" which makes the "make package"     target work
 again for restricted packages like "acroread7".

---
 mk/install/install.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'mk/install')

diff --git a/mk/install/install.mk b/mk/install/install.mk
index a5bccbdb051..98ecd828404 100644
--- a/mk/install/install.mk
+++ b/mk/install/install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: install.mk,v 1.3 2006/06/05 22:49:44 jlam Exp $
+# $NetBSD: install.mk,v 1.4 2006/06/07 10:04:04 tron Exp $
 
 ######################################################################
 ### install (PUBLIC)
@@ -75,11 +75,11 @@ install-check-version: ${_EXTRACT_COOKIE}
 	extractname=`${CAT} ${_EXTRACT_COOKIE}`;			\
 	pkgname=${PKGNAME};						\
 	case "$$extractname" in						\
-	"")	${WARNING_MSG} "Warning: ${WRKDIR} may contain an older version of ${PKGBASE}" ;; \
+	"")	${WARNING_MSG} "${WRKDIR} may contain an older version of ${PKGBASE}" ;; \
 	"$$pkgname")	;;						\
-	*)	${WARNING_MSG} "Warning: Package version $$extractname in ${WRKDIR}"; \
-		${WARNING_MSG} "         Current version $$pkgname in ${PKG_PATH}"; \
-		${WARNING_MSG} "         Cleaning and rebuilding $$pkgname...";	\
+	*)	${WARNING_MSG} "Package version $$extractname in ${WRKDIR}"; \
+		${WARNING_MSG} "Current version $$pkgname in ${PKG_PATH}"; \
+		${WARNING_MSG} "Cleaning and rebuilding $$pkgname...";	\
 		${MAKE} clean && ${MAKE} build ;;			\
 	esac
 
@@ -173,7 +173,7 @@ install-check-umask:
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	umask=`${SH} -c umask`;						\
 	if ${TEST} "$$umask" -ne ${DEF_UMASK}; then			\
-		${WARNING_MSG} "Warning: your umask is \`\`$$umask''.";	\
+		${WARNING_MSG} "Your umask is \`\`$$umask''.";	\
 		${WARNING_MSG} "If this is not desired, set it to an appropriate value (${DEF_UMASK}) and install"; \
 		${WARNING_MSG} "this package again by \`\`${MAKE} deinstall reinstall''."; \
         fi
-- 
cgit v1.2.3