diff options
| -rw-r--r-- | mk/bsd.pkg.update.mk | 8 | ||||
| -rw-r--r-- | mk/install/install.mk | 12 | ||||
| -rw-r--r-- | mk/package/package.mk | 16 |
3 files changed, 18 insertions, 18 deletions
diff --git a/mk/bsd.pkg.update.mk b/mk/bsd.pkg.update.mk index f713d973853..bd43ff2d971 100644 --- a/mk/bsd.pkg.update.mk +++ b/mk/bsd.pkg.update.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.update.mk,v 1.4 2006/06/05 22:49:44 jlam Exp $ +# $NetBSD: bsd.pkg.update.mk,v 1.5 2006/06/07 10:04:03 tron Exp $ # # This Makefile fragment is included by bsd.pkg.mk and contains the targets # and variables for "make update". @@ -100,9 +100,9 @@ clean-update: ${_PKG_SILENT}${_PKG_DEBUG} \ ${MAKE} ${MAKEFLAGS} clean update-dirlist \ DIRLIST="`${CAT} ${_DDIR}`" PKGLIST="`${CAT} ${_DLIST}`" - @${WARNING_MSG} "Warning: preserved leftover directory list. Your next" - @${WARNING_MSG} " \`\`${MAKE} update'' may fail. It is advised to use" - @${WARNING_MSG} " \`\`${MAKE} update REINSTALL=YES'' instead!" + @${WARNING_MSG} "preserved leftover directory list. Your next" + @${WARNING_MSG} "\`\`${MAKE} update'' may fail. It is advised to use" + @${WARNING_MSG} "\`\`${MAKE} update REINSTALL=YES'' instead!" .endif .endif # !target(update) 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 diff --git a/mk/package/package.mk b/mk/package/package.mk index 9d72558fb67..1b2feb3d804 100644 --- a/mk/package/package.mk +++ b/mk/package/package.mk @@ -1,4 +1,4 @@ -# $NetBSD: package.mk,v 1.3 2006/06/05 22:49:44 jlam Exp $ +# $NetBSD: package.mk,v 1.4 2006/06/07 10:04:04 tron Exp $ _PACKAGE_COOKIE= ${WRKDIR}/.package_done @@ -97,15 +97,15 @@ package-create: .PHONY: package-warnings package-warnings: .if defined(NO_BIN_ON_CDROM) - @${WARNING_MSG} "Warning: ${PKGNAME} may not be put on a CD-ROM:" - @${wARN_MSG} " " ${NO_BIN_ON_CDROM:Q} + @${WARNING_MSG} "${PKGNAME} may not be put on a CD-ROM:" + @${WARNING_MSG} ${NO_BIN_ON_CDROM:Q} .endif .if defined(NO_BIN_ON_FTP) - @${WARNING_MSG} "Warning: ${PKGNAME} may not be made available through FTP:" - @${WARNING_MSG} " " ${NO_BIN_ON_FTP:Q} + @${WARNING_MSG} "${PKGNAME} may not be made available through FTP:" + @${WARNING_MSG} ${NO_BIN_ON_FTP:Q} .endif .if defined(ABI_DEPENDS) && !empty(USE_ABI_DEPENDS:M[Nn][Oo]) - @${WARNING_MSG} "Warning: ABI dependency recommendations are being ignored!" - @${WARNING_MSG} " ${PKGNAME} should not be uploaded nor" - @${WARNING_MSG} " otherwise be used as a binary package!" + @${WARNING_MSG} "ABI dependency recommendations are being ignored!" + @${WARNING_MSG} "${PKGNAME} should not be uploaded nor" + @${WARNING_MSG} "otherwise be used as a binary package!" .endif |