[src/netbsd-1-6]: src/sys/conf pullup-1-6 ticket #496 (wrstuden).

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

details:   https://anonhg.NetBSD.org/src/rev/f8a13ce870e2
branches:  netbsd-1-6
changeset: 528424:f8a13ce870e2
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Jul 15 16:08:15 2002 +0000

description:
pullup-1-6 ticket #496 (wrstuden).

Original log message:
Fix cscope and mkid targets so that they work even when the kernel
compile directory is not under /usr/src/sys (i.e. when 'S' is not
'../../../..'). Pointed out by Robert Elz in PR 17384.

diffstat:

 sys/conf/Makefile.kern.inc |  28 +++++++++-------------------
 1 files changed, 9 insertions(+), 19 deletions(-)

diffs (50 lines):

diff -r 46bd860d3207 -r f8a13ce870e2 sys/conf/Makefile.kern.inc
--- a/sys/conf/Makefile.kern.inc        Mon Jul 15 16:05:55 2002 +0000
+++ b/sys/conf/Makefile.kern.inc        Mon Jul 15 16:08:15 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.kern.inc,v 1.13.4.4 2002/06/19 00:03:16 lukem Exp $
+#      $NetBSD: Makefile.kern.inc,v 1.13.4.5 2002/07/15 16:08:15 thorpej Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}. There are
@@ -298,14 +298,10 @@
 #
 cscope.out: Makefile
        @echo Building cscope.out source database
-       @${MAKE} LIBKERNSRC="`${KERNMAKE} showsources`" \
-               LIBCOMPATSRC="`${COMPATMAKE} showsources`" cscope.out1
-
-.PHONY: cscope.out1
-cscope.out1:
-       @echo ${SRCS} ${LIBKERNSRC:S|^|${KERNDST}/|} \
-               ${LIBCOMPATSRC:S|^|${COMPATDST}/|} \
-               | ${CSCOPE} -k -i - -b `echo ${INCLUDES} | sed s/-nostdinc//`
+       @echo ${SRCS} `sed 's/[^:]*://;s/^ *//;s/ *\\\\ *$$//;' \
+       lib/kern/.depend lib/compat/.depend | tr ' ' '\n' | \
+       sed "s|^../../||" | sort -u` \
+       | ${CSCOPE} -k -i - -b `echo ${INCLUDES} | sed s/-nostdinc//`
 #      cscope doesn't write cscope.out if it's uptodate, so ensure
 #      make doesn't keep calling cscope when not needed.
        @touch cscope.out
@@ -324,17 +320,11 @@
 ID: Makefile depend
 # Same dance as cscope.out/cscope.out1
        @echo Building mkid database
-       @${MAKE} LIBKERNSRC="`${KERNMAKE} showsources`" \
-               LIBCOMPATSRC="`${COMPATMAKE} showsources`" \
-               LIBKERNDEPEND="`sed 's/[^:]*://;s/^ *//;s/ *\\\\ *$$//;' lib/kern//.depend | tr ' ' '\n' | sort -u`" \
-               LIBCOMPDEPEND="`sed 's/[^:]*://;s/^ *//;s/ *\\\\ *$$//;' lib/compat/.depend | tr ' ' '\n' | sort -u`" ID1
+       @${MKID} `sed 's/[^:]*://;s/^ *//;s/ *\\\\ *$$//;' lib/kern/.depend \
+       lib/compat/.depend | tr ' ' '\n' | sed "s|^../../||" | sort -u` \
+       `sed 's/[^:]*://;s/^ *//;s/ *\\\\ *$$//;' .depend | tr ' ' '\n' \
+       | sort -u`
 
-.PHONY: ID1
-ID1:
-       @${MKID} ${SRCS} ${LIBKERNSRC:S|^|${KERNDST}/|} \
-               ${LIBCOMPATSRC:S|^|${COMPATDST}/|} \
-               ${LIBKERNDEPEND:S|^../../||} ${LIBCOMPDEPEND:S|^../../||} \
-       `sed 's/[^:]*://;s/^ *//;s/ *\\\\ *$$//;' .depend | tr ' ' '\n' | sort -u`
 .endif
 
 ##