Re: CVS commit: src (postinstall changes for mtree)

[Martin Husemann <martin%duskware.de@localhost>]

On Mon, Apr 26, 2010 at 10:14:58AM +0200, Martin Husemann wrote:
> If USE_TOOLS != yes it should just use cat (or explicitly /bin/cat).

Or slightly different, just check if the command exists...

Martin

Index: Makefile
===================================================================
RCS file: /cvsroot/src/etc/mtree/Makefile,v
retrieving revision 1.16
diff -c -u -r1.16 Makefile
--- Makefile    23 Apr 2010 19:21:08 -0000      1.16
+++ Makefile    26 Apr 2010 23:10:35 -0000
@@ -39,8 +39,13 @@
 TOOL_MTREE.unpriv=     -W
 .endif
 
+.if !exists(${TOOL_CAT:[1]})
+TOOL_OR_HOST_CAT=      cat
+.else
+TOOL_OR_HOST_CAT=      ${TOOL_CAT}
+.endif
 emit_dist_file:
-       ${TOOL_CAT} ${.CURDIR}/NetBSD.dist.base ${EXTRA_DIST_FILES}
+       ${TOOL_OR_HOST_CAT} ${.CURDIR}/NetBSD.dist.base ${EXTRA_DIST_FILES}
 
 distrib-dirs: .PHONY check_DESTDIR NetBSD.dist
 .if !defined(DISTRIBUTION_DONE)                                                
# {