Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Fix what rev. 1.176 broke, in particular, doing a priv'd bui...



details:   https://anonhg.NetBSD.org/src/rev/46075185e33c
branches:  trunk
changeset: 533251:46075185e33c
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Jun 26 00:10:16 2002 +0000

description:
Fix what rev. 1.176 broke, in particular, doing a priv'd build into
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.

diffstat:

 Makefile |  16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diffs (48 lines):

diff -r 9de51325cf9b -r 46075185e33c Makefile
--- a/Makefile  Tue Jun 25 22:55:56 2002 +0000
+++ b/Makefile  Wed Jun 26 00:10:16 2002 +0000
@@ -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
@@ -94,6 +94,10 @@
        @(cd ${.CURDIR}/regress && ${MAKE} regress)
 .endif
 
+.if defined(UNPRIVED)
+NOPOSTINSTALL= # defined
+.endif
+
 afterinstall:
 .if ${MKMAN} != "no"
        (cd ${.CURDIR}/share/man && ${MAKE} makedb)
@@ -101,8 +105,8 @@
 .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:
@@ -158,12 +162,14 @@
 # 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.



Home | Main Index | Thread Index | Old Index