[src/trunk]: src/distrib/common Allow ${CRUNCHBIN} to be optional by defaulti...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4ae76fb7dd25
branches:  trunk
changeset: 552783:4ae76fb7dd25
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Oct 03 02:46:52 2003 +0000

description:
Allow ${CRUNCHBIN} to be optional by defaulting to "." when doing the
"${.OODATE}" check.
Problem noticed in a build that uses Makefile.image but not Makefile.crunch.

diffstat:

 distrib/common/Makefile.image |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 2d066b31b8a2 -r 4ae76fb7dd25 distrib/common/Makefile.image
--- a/distrib/common/Makefile.image     Fri Oct 03 02:15:17 2003 +0000
+++ b/distrib/common/Makefile.image     Fri Oct 03 02:46:52 2003 +0000
@@ -1,11 +1,10 @@
-#      $NetBSD: Makefile.image,v 1.25 2003/07/10 10:34:04 lukem Exp $
+#      $NetBSD: Makefile.image,v 1.26 2003/10/03 02:46:52 lukem Exp $
 #
 # Makefile snippet to build a tree from the provided lists,
 # and make an ffs file system image from that tree
 #
 # Required variables:
 #      NETBSDSRCDIR    top level of src tree (set by <bsd.own.mk>)
-#      CRUNCHBIN       name of crunchgen(1)ed binary
 #      LISTS           list file(s) to use
 #      IMAGEDEPENDS    depends for ${IMAGE}
 #      IMAGEENDIAN     endianness of ${IMAGE}
@@ -16,6 +15,7 @@
 #      IMAGE           name of target image
 #      IMAGEPOSTBUILD  operation to run on ${IMAGE} ${.TARGET} after its built
 #                      (if this returns non zero, ${.TARGET} is removed)
+#      CRUNCHBIN       name of crunchgen(1)ed binary
 #      DESTDIR         destination directory
 #      MAKEFS_FLAGS    extra options to ${TOOL_MAKEFS}
 #      PARSELISTENV    environment variables to set for parselist.awk
@@ -41,8 +41,9 @@
 
 .if !target(${WORKBUILT})                                      # {
 ${WORKBUILT}: ${IMAGEDEPENDS} ${WORKSPEC} ${PARSELISTDEP} ${LISTS}
-       @# There is a .PHONY ${CRUNCHBIN}, so check if out of date by hand
-       [ "${.OODATE}" = ${CRUNCHBIN} -a -f ${WORKBUILT} -a ${WORKBUILT} -nt ${CRUNCHBIN} ]  || { \
+#      There is a .PHONY ${CRUNCHBIN}, so check if out of date by hand
+#      Default to `.' if ${CRUNCHBIN} isn't set, to always force a rebuild.
+       [ "${.OODATE}" = ${CRUNCHBIN:U.} -a -f ${WORKBUILT} -a ${WORKBUILT} -nt ${CRUNCHBIN:U.} ]  || { \
        echo "Building tree into ${WORKDIR}"; \
        rm -rf ${WORKDIR} ${WORKBUILT}; \
        mkdir -m 755 ${WORKDIR} &&  \