d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(1) Be nicer about mtree file missing. (Actually, just suggest where

Browse Source 
you can get one from.)

(2) Use "reinstall" as DEPENDS_TARGET if target is "reinstall".  In
    particular, this will make it possible to do a "make reinstall" on
    several NFS clients and have them install all dependencies
    correctly.
Tested by:	davidn
This commit is contained in:
asami 1997-08-20 03:44:14 +00:00
parent 0408a54150
commit 4eef9897c4
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
share/mk/bsd.port.mk
View File

@ -1,7 +1,7 @@
#-*- mode: Fundamental; tab-width: 4; -*-
# ex:ts=4
#
# $Id: bsd.port.mk,v 1.262 1997/07/10 02:29:51 asami Exp $
# $Id: bsd.port.mk,v 1.263 1997/07/17 17:47:36 markm Exp $
# $NetBSD: $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
@ -791,8 +791,12 @@ all: build
.endif
.if !defined(DEPENDS_TARGET)
.if make(reinstall)
DEPENDS_TARGET= reinstall
.else
DEPENDS_TARGET= install
.endif
.endif
################################################################
# The following are used to create easy dummy targets for
@ -1113,7 +1117,13 @@ _PORT_USE: .USE
.if make(real-install)
.if !defined(NO_MTREE)
@if [ `id -u` = 0 ]; then \
${MTREE_CMD} ${MTREE_ARGS} ${PREFIX}/; \
if [ ! -f ${MTREE_FILE} ]; then \
${ECHO_MSG} "Error: mtree file \"${MTREE_FILE}\" is missing."; \
${ECHO_MSG} "Copy it from a suitable location (e.g., /usr/src/etc/mtree) and try again."; \
exit 1; \
else \
${MTREE_CMD} ${MTREE_ARGS} ${PREFIX}/; \
fi; \
else \
${ECHO_MSG} "Warning: not superuser, can't run mtree."; \
${ECHO_MSG} "Become root and try again to ensure correct permissions."; \
@ -1252,7 +1262,7 @@ checkpatch:
.if !target(reinstall)
reinstall:
@${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
@${MAKE} install
@DEPENDS_TARGET=${DEPENDS_TARGET} ${MAKE} install
.endif
################################################################