diff options
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/bsd.obj.mk | 8 | ||||
| -rw-r--r-- | share/mk/bsd.subdir.mk | 11 |
2 files changed, 10 insertions, 9 deletions
diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk index 3551053..69c84ea 100644 --- a/share/mk/bsd.obj.mk +++ b/share/mk/bsd.obj.mk @@ -128,14 +128,6 @@ clean: cleandir: cleanobj -DISTRIBUTION?= base -.if !target(distribute) -distribute: -.for dist in ${DISTRIBUTION} - cd ${.CURDIR}; ${MAKE} install DESTDIR=${DISTDIR}/${dist} SHARED=copies -.endfor -.endif - .include <bsd.subdir.mk> .endif !target(__<bsd.obj.mk>__) diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk index 11b409b..7cfc446 100644 --- a/share/mk/bsd.subdir.mk +++ b/share/mk/bsd.subdir.mk @@ -31,8 +31,17 @@ .include <bsd.init.mk> +DISTRIBUTION?= base +.if !target(distribute) +distribute: +.for dist in ${DISTRIBUTION} + cd ${.CURDIR}; \ + ${MAKE} install -DNO_SUBDIR DESTDIR=${DISTDIR}/${dist} SHARED=copies +.endfor +.endif + _SUBDIR: .USE -.if defined(SUBDIR) && !empty(SUBDIR) +.if defined(SUBDIR) && !empty(SUBDIR) && !defined(NO_SUBDIR) @for entry in ${SUBDIR}; do \ if test -d ${.CURDIR}/$${entry}.${MACHINE_ARCH}; then \ ${ECHODIR} "===> ${DIRPRFX}$${entry}.${MACHINE_ARCH}"; \ |
