[Midnightbsd-cvs] src [9191] trunk/share/mk/bsd.obj.mk: bmake fixes

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Oct 17 09:12:10 EDT 2016


Revision: 9191
          http://svnweb.midnightbsd.org/src/?rev=9191
Author:   laffer1
Date:     2016-10-17 09:12:10 -0400 (Mon, 17 Oct 2016)
Log Message:
-----------
bmake fixes

Modified Paths:
--------------
    trunk/share/mk/bsd.obj.mk

Modified: trunk/share/mk/bsd.obj.mk
===================================================================
--- trunk/share/mk/bsd.obj.mk	2016-10-17 13:05:56 UTC (rev 9190)
+++ trunk/share/mk/bsd.obj.mk	2016-10-17 13:12:10 UTC (rev 9191)
@@ -45,6 +45,8 @@
 
 .if defined(MAKEOBJDIRPREFIX)
 CANONICALOBJDIR:=${MAKEOBJDIRPREFIX}${.CURDIR}
+.elif defined(MAKEOBJDIR) &&${MAKEOBJDIR:M/*} != ""
+CANONICALOBJDIR:=${MAKEOBJDIR}
 .else
 CANONICALOBJDIR:=/usr/obj${.CURDIR}
 .endif
@@ -117,6 +119,11 @@
 .endif
 	@if [ -L ${.CURDIR}/obj ]; then rm -f ${.CURDIR}/obj; fi
 
+# Tell bmake not to look for generated files via .PATH
+.if !empty(CLEANFILES)
+.NOPATH: ${CLEANFILES}
+.endif
+
 .if !target(clean)
 clean:
 .if defined(CLEANFILES) && !empty(CLEANFILES)



More information about the Midnightbsd-cvs mailing list