[Midnightbsd-cvs] src [6725] trunk/share/mk/bsd.crunchgen.mk: define MAKE cmd

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Aug 29 17:08:50 EDT 2014


Revision: 6725
          http://svnweb.midnightbsd.org/src/?rev=6725
Author:   laffer1
Date:     2014-08-29 17:08:50 -0400 (Fri, 29 Aug 2014)
Log Message:
-----------
define MAKE cmd

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

Modified: trunk/share/mk/bsd.crunchgen.mk
===================================================================
--- trunk/share/mk/bsd.crunchgen.mk	2014-08-27 11:51:08 UTC (rev 6724)
+++ trunk/share/mk/bsd.crunchgen.mk	2014-08-29 21:08:50 UTC (rev 6725)
@@ -36,6 +36,8 @@
 CRUNCHOBJS= ${.OBJDIR}
 .if defined(MAKEOBJDIRPREFIX)
 CANONICALOBJDIR:= ${MAKEOBJDIRPREFIX}${.CURDIR}
+.elif defined(MAKEOBJDIR) && ${MAKEOBJDIR:M/*} != ""
+CANONICALOBJDIR:=${MAKEOBJDIR}
 .else
 CANONICALOBJDIR:= /usr/obj${.CURDIR}
 .endif
@@ -42,6 +44,9 @@
 
 CLEANFILES+= $(CONF) *.o *.lo *.c *.mk *.cache *.a *.h
 
+# Don't try to extract debug info from ${PROG}.
+NO_DEBUG_FILES=
+
 # Program names and their aliases contribute hardlinks to 'rescue' executable,
 # except for those that get suppressed.
 .for D in $(CRUNCH_SRCDIRS)
@@ -100,7 +105,7 @@
 .MAKEFLAGS:= ${.MAKEFLAGS:N-P}
 .ORDER: $(OUTPUTS) objs
 $(OUTPUTS): $(CONF)
-	MAKEOBJDIRPREFIX=${CRUNCHOBJS} crunchgen -fq -m $(OUTMK) \
+	MAKE=${MAKE} MAKEOBJDIRPREFIX=${CRUNCHOBJS} crunchgen -fq -m $(OUTMK) \
 	    -c $(OUTC) $(CONF)
 
 $(PROG): $(OUTPUTS) objs



More information about the Midnightbsd-cvs mailing list