diff options
author | Satoshi Asami <asami@FreeBSD.org> | 1997-06-18 03:20:22 +0000 |
---|---|---|
committer | Satoshi Asami <asami@FreeBSD.org> | 1997-06-18 03:20:22 +0000 |
commit | a53293467b3c2ffc1f49f915767749f80e0c6b6a (patch) | |
tree | 748e244af0d5e29fd6423f9f0a801e4b01490950 /Mk | |
parent | Upgrade to 19970614 release (diff) |
Move the "umask ?= 0022" check (a warning only) from the default
"do-install" target to the beginning of the "install" meta-target, so
that ports that define their own do-install will also run it without
having to duplicate it themselves.
Tested by: rebuilding all packages
Notes
Notes:
svn path=/head/; revision=6987
Diffstat (limited to 'Mk')
-rw-r--r-- | Mk/bsd.port.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 1c82258a01b7..af7bb33a3b62 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $Id: bsd.port.mk,v 1.257 1997/04/30 03:12:05 asami Exp $ +# $Id: bsd.port.mk,v 1.258 1997/06/04 00:12:19 asami Exp $ # $NetBSD: $ # # bsd.port.mk - 940820 Jordan K. Hubbard. @@ -960,11 +960,6 @@ do-build: .if !target(do-install) do-install: - @if [ `/bin/sh -c umask` != 0022 ]; then \ - ${ECHO_MSG} "===> Warning: your umask is \"`/bin/sh -c umask`"\".; \ - ${ECHO_MSG} " If this is not desired, set it to an appropriate value"; \ - ${ECHO_MSG} " and install this port again by \`\`make reinstall''."; \ - fi .if defined(USE_GMAKE) @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) .if defined(USE_IMAKE) && !defined(NO_INSTALL_MANPAGES) @@ -1054,6 +1049,11 @@ _PORT_USE: .USE exit 1; \ fi .endif + @if [ `/bin/sh -c umask` != 0022 ]; then \ + ${ECHO_MSG} "===> Warning: your umask is \"`/bin/sh -c umask`"\".; \ + ${ECHO_MSG} " If this is not desired, set it to an appropriate value"; \ + ${ECHO_MSG} " and install this port again by \`\`make reinstall''."; \ + fi @cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} run-depends lib-depends .endif .if make(real-install) |