summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorasami <asami@FreeBSD.org>1997-06-18 03:20:22 +0000
committerasami <asami@FreeBSD.org>1997-06-18 03:20:22 +0000
commita5a15a3d86b998f9f3deb147ad431fde8f2bb1c5 (patch)
tree12c6f1e08da127165fd5531e85d4f663e1fe8a1f /share
parent562c018967aaa72609d0c7069dd0ce39bc84cb4f (diff)
downloadFreeBSD-src-a5a15a3d86b998f9f3deb147ad431fde8f2bb1c5.zip
FreeBSD-src-a5a15a3d86b998f9f3deb147ad431fde8f2bb1c5.tar.gz
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
Diffstat (limited to 'share')
-rw-r--r--share/mk/bsd.port.mk12
1 files changed, 6 insertions, 6 deletions
diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk
index 1c82258..af7bb33 100644
--- a/share/mk/bsd.port.mk
+++ b/share/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)
OpenPOWER on IntegriCloud