diff options
| author | bapt <bapt@FreeBSD.org> | 2015-10-19 11:51:10 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2015-10-19 11:51:10 +0000 |
| commit | d93a51152871c391e2ff845cfd568a72cef65606 (patch) | |
| tree | c6a11d30ab57567b8bd34aa1c679296e53bab799 /share/mk/bsd.prog.mk | |
| parent | 4f9c78fa034aa8b8b2762c76143139953e2e2474 (diff) | |
| parent | 5855be3ec6724e6451361f6ef8bd165bf9f949df (diff) | |
| download | FreeBSD-src-d93a51152871c391e2ff845cfd568a72cef65606.zip FreeBSD-src-d93a51152871c391e2ff845cfd568a72cef65606.tar.gz | |
Merge from head
Diffstat (limited to 'share/mk/bsd.prog.mk')
| -rw-r--r-- | share/mk/bsd.prog.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 966c17e..fbb6922 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -56,9 +56,9 @@ PROG_FULL=${PROG}.full # Use ${DEBUGDIR} for base system debug files, else .debug subdirectory .if defined(BINDIR) && (\ ${BINDIR} == "/bin" ||\ - ${BINDIR} == "/libexec" ||\ + ${BINDIR:C%/libexec(/.*)?%/libexec%} == "/libexec" ||\ ${BINDIR} == "/sbin" ||\ - ${BINDIR:C%/usr/(bin|bsdinstall|libexec|lpr|sendmail|sm.bin|sbin)(/.*)?%/usr/bin%} == "/usr/bin"\ + ${BINDIR:C%/usr/(bin|bsdinstall|libexec|lpr|sendmail|sm.bin|sbin|tests)(/.*)?%/usr/bin%} == "/usr/bin"\ ) DEBUGFILEDIR= ${DEBUGDIR}${BINDIR} .else @@ -205,7 +205,7 @@ _proginstall: ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME} .if ${MK_DEBUG_FILES} != "no" .if defined(DEBUGMKDIR) - ${INSTALL} -T debug -d ${DESTDIR}${DEBUGFILEDIR} + ${INSTALL} -T debug -d ${DESTDIR}${DEBUGFILEDIR}/ .endif ${INSTALL} -T debug -o ${BINOWN} -g ${BINGRP} -m ${DEBUGMODE} \ ${PROGNAME}.debug ${DESTDIR}${DEBUGFILEDIR}/${PROGNAME}.debug |
