[src/trunk]: src/external/bsd/nvi/usr.bin/nvi PR toolchain/48833: Ilia Zykov:...

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

details:   https://anonhg.NetBSD.org/src/rev/3e2081fe90e8
branches:  trunk
changeset: 796190:3e2081fe90e8
user:      dholland <dholland%NetBSD.org@localhost>
date:      Fri May 23 19:59:17 2014 +0000

description:
PR toolchain/48833: Ilia Zykov: nvi build fails if under /common

When autogenerating headers from source (yuck) use a more selective
pattern to avoid selecting anything if part of the current absolute
path happens to match part of the nvi source tree.

diffstat:

 external/bsd/nvi/usr.bin/nvi/Makefile |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (23 lines):

diff -r d77435dd13ce -r 3e2081fe90e8 external/bsd/nvi/usr.bin/nvi/Makefile
--- a/external/bsd/nvi/usr.bin/nvi/Makefile     Fri May 23 19:51:16 2014 +0000
+++ b/external/bsd/nvi/usr.bin/nvi/Makefile     Fri May 23 19:59:17 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2013/11/30 14:52:40 christos Exp $
+#      $NetBSD: Makefile,v 1.5 2014/05/23 19:59:17 dholland Exp $
 
 .include <bsd.own.mk>
 
@@ -79,10 +79,11 @@
 .for i in cl common ex ip ipc vi
 DPSRCS+=${i}_extern.h
 CLEANFILES+=${i}_extern.h
-_${i}_SRCS != echo ${DIST}/${i}/*.c ${DIST}/${i}/*.xs
+# does not work, DIST isn't set yet here
+#_${i}_SRCS != echo ${DIST}/${i}/*.c ${DIST}/${i}/*.xs
 ${i}_extern.h: ${SRCS}
        ${_MKTARGET_CREATE}
-       @${TOOL_SED} -n "s/^ \* PUBLIC: \(.*\)/\1/p" ${.ALLSRC:M*/$i/*} > ${.TARGET}.tmp
+       @${TOOL_SED} -n "s/^ \* PUBLIC: \(.*\)/\1/p" ${.ALLSRC:M${DIST}/$i/*} > ${.TARGET}.tmp
        @if cmp -s ${.TARGET}.tmp ${.TARGET}; then \
                rm -f ${.TARGET}.tmp; \
        else \