View | Details | Raw Unified | Return to bug 211564 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile.inc1 (-1 / +1 lines)
Lines 1023-1029 Link Here
1023
	-mkdir ${DESTDIR}/${DISTDIR}/base
1023
	-mkdir ${DESTDIR}/${DISTDIR}/base
1024
	${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
1024
	${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
1025
	    METALOG=${METALOG} ${IMAKE_INSTALL} ${IMAKE_MTREE} \
1025
	    METALOG=${METALOG} ${IMAKE_INSTALL} ${IMAKE_MTREE} \
1026
	    DISTBASE=/base DESTDIR=${DESTDIR}/${DISTDIR}/base \
1026
	    DISTBASE=${DESTDIR}/base DESTDIR=${DESTDIR}/${DISTDIR}/base \
1027
	    LOCAL_MTREE=${LOCAL_MTREE:Q} distrib-dirs
1027
	    LOCAL_MTREE=${LOCAL_MTREE:Q} distrib-dirs
1028
.endif
1028
.endif
1029
	${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
1029
	${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
(-)etc/Makefile (-2 / +2 lines)
Lines 192-199 Link Here
192
	# Avoid installing tests here; "make distribution" will do this and
192
	# Avoid installing tests here; "make distribution" will do this and
193
	# correctly place them in the right location.
193
	# correctly place them in the right location.
194
	${_+_}cd ${.CURDIR} ; ${MAKE} MK_TESTS=no install \
194
	${_+_}cd ${.CURDIR} ; ${MAKE} MK_TESTS=no install \
195
	    DESTDIR=${DISTDIR}/${DISTRIBUTION}
195
	    DESTDIR=${DESTDIR}/${DISTDIR}/${DISTRIBUTION}
196
	${_+_}cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION}
196
	${_+_}cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DESTDIR}/${DISTDIR}/${DISTRIBUTION}
197
197
198
.include <bsd.endian.mk>
198
.include <bsd.endian.mk>
199
.if ${TARGET_ENDIANNESS} == "1234"
199
.if ${TARGET_ENDIANNESS} == "1234"
(-)share/mk/bsd.subdir.mk (-1 / +1 lines)
Lines 85-91 Link Here
85
distribute: .MAKE
85
distribute: .MAKE
86
.for dist in ${DISTRIBUTION}
86
.for dist in ${DISTRIBUTION}
87
	${_+_}cd ${.CURDIR}; \
87
	${_+_}cd ${.CURDIR}; \
88
	    ${MAKE} install installconfig -DNO_SUBDIR DESTDIR=${DISTDIR}/${dist} SHARED=copies
88
	    ${MAKE} install installconfig -DNO_SUBDIR DESTDIR=${DESTDIR}/${DISTDIR}/${dist} SHARED=copies
89
.endfor
89
.endfor
90
.endif
90
.endif
91
# Convenience targets to run 'build${target}' and 'install${target}' when
91
# Convenience targets to run 'build${target}' and 'install${target}' when

Return to bug 211564