summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.inc18
-rw-r--r--etc/Makefile1
-rw-r--r--etc/mtree/BSD.debug.dist2
3 files changed, 11 insertions, 0 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 9332b300e060..5d1917ca2b5b 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -557,6 +557,10 @@ _worldtmp:
mkdir -p ${WORLDTMP}${TESTSBASE}
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
-p ${WORLDTMP}${TESTSBASE} >/dev/null
+.if ${MK_DEBUG_FILES} != "no"
+ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
+ -p ${WORLDTMP}/usr/lib/debug/${TESTSBASE} >/dev/null
+.endif
.endif
.for _mtree in ${LOCAL_MTREE}
mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null
@@ -892,6 +896,10 @@ distributeworld installworld: _installcheck_world
-mkdir -p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE}
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
-p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE} >/dev/null
+.if ${MK_DEBUG_FILES} != "no"
+ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
+ -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib/debug/${TESTSBASE} >/dev/null
+.endif
.endif
.if defined(NO_ROOT)
${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.root.dist | \
diff --git a/etc/Makefile b/etc/Makefile
index 0112c617bc64..81b9a1973f2b 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -343,6 +343,7 @@ MTREES+= mtree/BSD.groff.dist /usr
.endif
.if ${MK_TESTS} != "no"
MTREES+= mtree/BSD.tests.dist ${TESTSBASE}
+MTREES+= mtree/BSD.tests.dist /usr/lib/debug/${TESTSBASE}
.endif
.if ${MK_SENDMAIL} != "no"
MTREES+= mtree/BSD.sendmail.dist /
diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist
index 9584e591eb47..8df0a725e5fe 100644
--- a/etc/mtree/BSD.debug.dist
+++ b/etc/mtree/BSD.debug.dist
@@ -61,6 +61,8 @@
..
sbin
..
+ tests
+ ..
..
..
..