Skip to content

Commit

Permalink
Fix what rev. 1.176 broke, in particular, doing a priv'd build into
Browse files Browse the repository at this point in the history
an NFS root area for a diskless client.  In such a situation, you
DO want the postinstall-check to be run.

The circumstances under which postinstall-check is now run:
* UNPRIVED is not set.
* The original target invoked was not distribution, release, or
  snapshot.
  • Loading branch information
thorpej committed Jun 26, 2002
1 parent 04bffa8 commit 62b3892
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.178 2002/06/20 08:21:59 enami Exp $
# $NetBSD: Makefile,v 1.179 2002/06/26 00:10:16 thorpej Exp $

# This is the top-level makefile for building NetBSD. For an outline of
# how to build a snapshot or release, as well as other release engineering
Expand Down Expand Up @@ -94,15 +94,19 @@ regression-tests:
@(cd ${.CURDIR}/regress && ${MAKE} regress)
.endif

.if defined(UNPRIVED)
NOPOSTINSTALL= # defined
.endif

afterinstall:
.if ${MKMAN} != "no"
(cd ${.CURDIR}/share/man && ${MAKE} makedb)
.endif
.if defined(UNPRIVED) && (${MKINFO} != "no")
(cd ${.CURDIR}/gnu/usr.bin/texinfo/install-info && ${MAKE} infodir-meta)
.endif
.if !defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/"
(cd ${.CURDIR} && ${MAKE} postinstall-check)
.if !defined(NOPOSTINSTALL)
(${MAKE} postinstall-check)
.endif

postinstall-check:
Expand Down Expand Up @@ -158,12 +162,14 @@ build:
# Build a full distribution, but not a release (i.e. no sets into
# ${RELEASEDIR}).

distribution: build
distribution:
(cd ${.CURDIR} && ${MAKE} NOPOSTINSTALL=1 build)
(cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 distribution)

# Build a release or snapshot (implies "make build").

release snapshot: build
release snapshot:
(cd ${.CURDIR} && ${MAKE} NOPOSTINSTALL=1 build)
(cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 release)

# Special components of the "make build" process.
Expand Down

0 comments on commit 62b3892

Please sign in to comment.