Source-Changes-HG archive

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

[src/netbsd-1-6]: src Pull up revisions 1.177 - 1.180



details:   https://anonhg.NetBSD.org/src/rev/0ba8a7dccd64
branches:  netbsd-1-6
changeset: 529356:0ba8a7dccd64
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Nov 15 04:15:13 2002 +0000

description:
Pull up revisions 1.177 - 1.180
    1.177:
        Change directory to .CURDIR before invoking ${MAKE}.
    1.178:
        Fix whitespace usage in comment.
    1.179:
        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.
    1.180:
        find the Makefile for postinstall-check in the presence of ${.OBJDIR}s

Resolves ticket #993 from grant (and possibly others), and some PRs

diffstat:

 Makefile |  24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diffs (68 lines):

diff -r c70f79fa48af -r 0ba8a7dccd64 Makefile
--- a/Makefile  Fri Nov 15 00:50:19 2002 +0000
+++ b/Makefile  Fri Nov 15 04:15:13 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.175.2.1 2002/11/01 11:55:04 tron Exp $
+#      $NetBSD: Makefile,v 1.175.2.2 2002/11/15 04:15:13 lukem 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
@@ -19,15 +19,15 @@
 #      software. It defaults to /. Note that programs are built against
 #      libraries installed in DESTDIR.
 #   MKMAN, if set to `no', will prevent building of manual pages.
-#   MKOBJDIRS, if not set to `no', will build object directories at 
+#   MKOBJDIRS, if not set to `no', will build object directories at
 #      an appropriate point in a build.
 #   MKSHARE, if set to `no', will prevent building and installing
 #      anything in /usr/share.
 #   UPDATE, if defined, will avoid a `make cleandir' at the start of
-#     `make build', as well as having the effects listed in
-#     /usr/share/mk/bsd.README.
+#      `make build', as well as having the effects listed in
+#      /usr/share/mk/bsd.README.
 #   NOCLEANDIR, if defined, will avoid a `make cleandir' at the start
-#     of the `make build'.
+#      of the `make build'.
 #   NOINCLUDES will avoid the `make includes' usually done by `make build'.
 #
 # Targets:
@@ -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} == "/"
-       (${MAKE} postinstall-check)
+.if !defined(NOPOSTINSTALL)
+       (cd ${.CURDIR} && ${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