Source-Changes-HG archive

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

[src/netbsd-1-4]: src/share/mk Pull up revisino 1.103:



details:   https://anonhg.NetBSD.org/src/rev/f4f8d8962ac6
branches:  netbsd-1-4
changeset: 469363:f4f8d8962ac6
user:      he <he%NetBSD.org@localhost>
date:      Fri Sep 10 23:02:50 1999 +0000

description:
Pull up revisino 1.103:
  Allow natural use of multiple "make" targets in the main tree
  without setting BUILD, fixing PR#8313 and PR#3894.

diffstat:

 share/mk/bsd.prog.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r e7e5a61b7396 -r f4f8d8962ac6 share/mk/bsd.prog.mk
--- a/share/mk/bsd.prog.mk      Fri Sep 10 23:01:18 1999 +0000
+++ b/share/mk/bsd.prog.mk      Fri Sep 10 23:02:50 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.prog.mk,v 1.100 1999/02/12 01:10:08 lukem Exp $
+#      $NetBSD: bsd.prog.mk,v 1.100.2.1 1999/09/10 23:02:50 he Exp $
 #      @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
 
 .if !target(__initialized__)
@@ -136,7 +136,7 @@
 .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${BINDIR}/${PROGNAME}
 .endif
-.if !defined(BUILD)
+.if !defined(BUILD) && !make(all) && !make(${PROG})
 ${DESTDIR}${BINDIR}/${PROGNAME}: .MADE
 .endif
 
@@ -170,7 +170,7 @@
 .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}}
 .endif
-.if !defined(BUILD)
+.if !defined(BUILD) && !make(all) && !make(${S})
 ${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}}: .MADE
 .endif
 



Home | Main Index | Thread Index | Old Index