Attachment #33142 for bug #54422

View | Details | Raw Unified | Return to bug 54422
Collapse All | Expand All




.else
install-${_curformat}: ${DOC}.${_curformat}
.endif
	@[ -d ${DESTDIR} ] || ${MKDIR} ${DESTDIR}
.if ${_cf} == "html-split"
	${INSTALL_DOCS} $$(${XARGS} < HTML.manifest) ${DESTDIR}
.else

.endif
.for _curimage in ${IMAGES_LIB}
	@[ -d ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H} ] || \
		${MKDIR} ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H}
	${INSTALL_DOCS} ${LOCAL_IMAGES_LIB_DIR}/${_curimage} \
			${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H}
.endfor

# Install at first images from /usr/share/images then localized ones
# cause of a different origin path.
.for _curimage in ${IMAGES_PNG:M*/*:M*share*}
	${MKDIR} ${DESTDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||}
	${INSTALL_DOCS} ${_curimage} ${DESTDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||}
.endfor
.for _curimage in ${IMAGES_PNG:M*/*:N*share*}
	${MKDIR} ${DESTDIR}/${_curimage:H}
	${INSTALL_DOCS} ${_curimage} ${DESTDIR}/${_curimage:H}
.endfor
.for _curimage in ${IMAGES_PNG:N*/*}

.endfor
.elif ${_cf} == "tex" || ${_cf} == "dvi"
.for _curimage in ${IMAGES_EPS:M*/*}
	${MKDIR} ${DESTDIR}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR:T}/||}
	${INSTALL_DOCS} ${_curimage} ${DESTDIR}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR:T}/||}
.endfor
.for _curimage in ${IMAGES_EPS:N*/*}

.if ${_cf} == "html-split"
.for _compressext in ${KNOWN_COMPRESS}
install-${_curformat}.tar.${_compressext}: ${DOC}.${_curformat}.tar.${_compressext}
	@[ -d ${DESTDIR} ] || ${MKDIR} ${DESTDIR}
	${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}
.endfor
.else
.for _compressext in ${KNOWN_COMPRESS}
.if !target(install-${_curformat}.${_compressext})
install-${_curformat}.${_compressext}: ${DOC}.${_curformat}.${_compressext}
	@[ -d ${DESTDIR} ] || ${MKDIR} ${DESTDIR}
	${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}
.if ${_cf} == "pdb"
	${LN} -f ${DESTDIR}/${.ALLSRC} \




_cf=${_curformat}
.if !target(install-${_cf})
install-${_curformat}: ${DOC}.${_curformat}
	@[ -d ${DESTDIR} ] || ${MKDIR} ${DESTDIR}
	${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}
.if !empty(CSS_SHEET)
	${INSTALL_DOCS} ${CSS_SHEET} ${DESTDIR}
.endif
.for _curimage in ${IMAGES_LIB}
	@[ -d ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H} ] || \
		${MKDIR} ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H}
	${INSTALL_DOCS} ${LOCAL_IMAGES_LIB_DIR}/${_curimage} \
			${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H}
.endfor

# the ones that don't contain a directory separator, and install them in the
# top level.
.for _curimage in ${IMAGES_PNG:M*/*:M*share*}
	${MKDIR} ${DESTDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||}
	${INSTALL_DOCS} ${_curimage} ${DESTDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||}
.endfor
.for _curimage in ${IMAGES_PNG:N*/*}


.for _compressext in ${KNOWN_COMPRESS}
install-${_cf}.${_compressext}: ${DOC}.${_cf}.${_compressext}
	@[ -d ${DESTDIR} ] || ${MKDIR} ${DESTDIR}
	${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}
.endfor
.endif

Lines 138-144 Link Here

(-)share/mk/doc.subdir.mk (-2 / +2 lines)
138	.if !target(obj)	138	.if !target(obj)
139	obj: _SUBDIRUSE	139	obj: _SUBDIRUSE
140	@if ! [ -d ${CANONICALOBJDIR}/ ]; then \	140	@if ! [ -d ${CANONICALOBJDIR}/ ]; then \
141	${MKDIR} -p ${CANONICALOBJDIR}; \	141	${MKDIR} ${CANONICALOBJDIR}; \
142	if ! [ -d ${CANONICALOBJDIR}/ ]; then \	142	if ! [ -d ${CANONICALOBJDIR}/ ]; then \
143	${ECHO_CMD} "Unable to create ${CANONICALOBJDIR}."; \	143	${ECHO_CMD} "Unable to create ${CANONICALOBJDIR}."; \
144	exit 1; \	144	exit 1; \
Lines 202-208 Link Here
202	_IMAGESUBDIR: .USE	202	_IMAGESUBDIR: .USE
203	.for dir in ${_imagesubdir}	203	.for dir in ${_imagesubdir}
204	@if ! [ -d ${CANONICALOBJDIR}/${dir}/ ]; then \	204	@if ! [ -d ${CANONICALOBJDIR}/${dir}/ ]; then \
205	${MKDIR} -p ${CANONICALOBJDIR}/${dir}; \	205	${MKDIR} ${CANONICALOBJDIR}/${dir}; \
206	if ! [ -d ${CANONICALOBJDIR}/${dir}/ ]; then \	206	if ! [ -d ${CANONICALOBJDIR}/${dir}/ ]; then \
207	${ECHO_CMD} "Unable to create ${CANONICALOBJDIR}/${dir}/."; \	207	${ECHO_CMD} "Unable to create ${CANONICALOBJDIR}/${dir}/."; \
208	exit 1; \	208	exit 1; \

Return to bug 54422

Lines 748-754 Link Here

(-)share/mk/doc.docbook.mk (-7 / +7 lines)
748	.else	748	.else
749	install-${_curformat}: ${DOC}.${_curformat}	749	install-${_curformat}: ${DOC}.${_curformat}
750	.endif	750	.endif
751	@[ -d ${DESTDIR} ] \|\| ${MKDIR} -p ${DESTDIR}	751	@[ -d ${DESTDIR} ] \|\| ${MKDIR} ${DESTDIR}
752	.if ${_cf} == "html-split"	752	.if ${_cf} == "html-split"
753	${INSTALL_DOCS} $$(${XARGS} < HTML.manifest) ${DESTDIR}	753	${INSTALL_DOCS} $$(${XARGS} < HTML.manifest) ${DESTDIR}
754	.else	754	.else
Lines 766-772 Link Here
766	.endif	766	.endif
767	.for _curimage in ${IMAGES_LIB}	767	.for _curimage in ${IMAGES_LIB}
768	@[ -d ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H} ] \|\| \	768	@[ -d ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H} ] \|\| \
769	${MKDIR} -p ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H}	769	${MKDIR} ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H}
770	${INSTALL_DOCS} ${LOCAL_IMAGES_LIB_DIR}/${_curimage} \	770	${INSTALL_DOCS} ${LOCAL_IMAGES_LIB_DIR}/${_curimage} \
771	${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H}	771	${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H}
772	.endfor	772	.endfor
Lines 777-787 Link Here
777	# Install at first images from /usr/share/images then localized ones	777	# Install at first images from /usr/share/images then localized ones
778	# cause of a different origin path.	778	# cause of a different origin path.
779	.for _curimage in ${IMAGES_PNG:M/:Mshare}	779	.for _curimage in ${IMAGES_PNG:M/:Mshare}
780	${MKDIR} -p ${DESTDIR:H:H}/${_curimage:H:S\|${IMAGES_EN_DIR}/\|\|:S\|${.CURDIR}\|\|}	780	${MKDIR} ${DESTDIR:H:H}/${_curimage:H:S\|${IMAGES_EN_DIR}/\|\|:S\|${.CURDIR}\|\|}
781	${INSTALL_DOCS} ${_curimage} ${DESTDIR:H:H}/${_curimage:H:S\|${IMAGES_EN_DIR}/\|\|:S\|${.CURDIR}\|\|}	781	${INSTALL_DOCS} ${_curimage} ${DESTDIR:H:H}/${_curimage:H:S\|${IMAGES_EN_DIR}/\|\|:S\|${.CURDIR}\|\|}
782	.endfor	782	.endfor
783	.for _curimage in ${IMAGES_PNG:M/:Nshare}	783	.for _curimage in ${IMAGES_PNG:M/:Nshare}
784	${MKDIR} -p ${DESTDIR}/${_curimage:H}	784	${MKDIR} ${DESTDIR}/${_curimage:H}
785	${INSTALL_DOCS} ${_curimage} ${DESTDIR}/${_curimage:H}	785	${INSTALL_DOCS} ${_curimage} ${DESTDIR}/${_curimage:H}
786	.endfor	786	.endfor
787	.for _curimage in ${IMAGES_PNG:N/}	787	.for _curimage in ${IMAGES_PNG:N/}
Lines 789-795 Link Here
789	.endfor	789	.endfor
790	.elif ${_cf} == "tex" \|\| ${_cf} == "dvi"	790	.elif ${_cf} == "tex" \|\| ${_cf} == "dvi"
791	.for _curimage in ${IMAGES_EPS:M/}	791	.for _curimage in ${IMAGES_EPS:M/}
792	${MKDIR} -p ${DESTDIR}/${_curimage:H:S\|${IMAGES_EN_DIR}/\|\|:S\|${.CURDIR:T}/\|\|}	792	${MKDIR} ${DESTDIR}/${_curimage:H:S\|${IMAGES_EN_DIR}/\|\|:S\|${.CURDIR:T}/\|\|}
793	${INSTALL_DOCS} ${_curimage} ${DESTDIR}/${_curimage:H:S\|${IMAGES_EN_DIR}/\|\|:S\|${.CURDIR:T}/\|\|}	793	${INSTALL_DOCS} ${_curimage} ${DESTDIR}/${_curimage:H:S\|${IMAGES_EN_DIR}/\|\|:S\|${.CURDIR:T}/\|\|}
794	.endfor	794	.endfor
795	.for _curimage in ${IMAGES_EPS:N/}	795	.for _curimage in ${IMAGES_EPS:N/}
Lines 802-815 Link Here
802	.if ${_cf} == "html-split"	802	.if ${_cf} == "html-split"
803	.for _compressext in ${KNOWN_COMPRESS}	803	.for _compressext in ${KNOWN_COMPRESS}
804	install-${_curformat}.tar.${_compressext}: ${DOC}.${_curformat}.tar.${_compressext}	804	install-${_curformat}.tar.${_compressext}: ${DOC}.${_curformat}.tar.${_compressext}
805	@[ -d ${DESTDIR} ] \|\| ${MKDIR} -p ${DESTDIR}	805	@[ -d ${DESTDIR} ] \|\| ${MKDIR} ${DESTDIR}
806	${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}	806	${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}
807	.endfor	807	.endfor
808	.else	808	.else
809	.for _compressext in ${KNOWN_COMPRESS}	809	.for _compressext in ${KNOWN_COMPRESS}
810	.if !target(install-${_curformat}.${_compressext})	810	.if !target(install-${_curformat}.${_compressext})
811	install-${_curformat}.${_compressext}: ${DOC}.${_curformat}.${_compressext}	811	install-${_curformat}.${_compressext}: ${DOC}.${_curformat}.${_compressext}
812	@[ -d ${DESTDIR} ] \|\| ${MKDIR} -p ${DESTDIR}	812	@[ -d ${DESTDIR} ] \|\| ${MKDIR} ${DESTDIR}
813	${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}	813	${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}
814	.if ${_cf} == "pdb"	814	.if ${_cf} == "pdb"
815	${LN} -f ${DESTDIR}/${.ALLSRC} \	815	${LN} -f ${DESTDIR}/${.ALLSRC} \

Lines 275-288 Link Here

(-)share/mk/doc.html.mk (-4 / +4 lines)
275	_cf=${_curformat}	275	_cf=${_curformat}
276	.if !target(install-${_cf})	276	.if !target(install-${_cf})
277	install-${_curformat}: ${DOC}.${_curformat}	277	install-${_curformat}: ${DOC}.${_curformat}
278	@[ -d ${DESTDIR} ] \|\| ${MKDIR} -p ${DESTDIR}	278	@[ -d ${DESTDIR} ] \|\| ${MKDIR} ${DESTDIR}
279	${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}	279	${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}
280	.if !empty(CSS_SHEET)	280	.if !empty(CSS_SHEET)
281	${INSTALL_DOCS} ${CSS_SHEET} ${DESTDIR}	281	${INSTALL_DOCS} ${CSS_SHEET} ${DESTDIR}
282	.endif	282	.endif
283	.for _curimage in ${IMAGES_LIB}	283	.for _curimage in ${IMAGES_LIB}
284	@[ -d ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H} ] \|\| \	284	@[ -d ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H} ] \|\| \
285	${MKDIR} -p ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H}	285	${MKDIR} ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H}
286	${INSTALL_DOCS} ${LOCAL_IMAGES_LIB_DIR}/${_curimage} \	286	${INSTALL_DOCS} ${LOCAL_IMAGES_LIB_DIR}/${_curimage} \
287	${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H}	287	${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H}
288	.endfor	288	.endfor
Lines 291-297 Link Here
291	# the ones that don't contain a directory separator, and install them in the	291	# the ones that don't contain a directory separator, and install them in the
292	# top level.	292	# top level.
293	.for _curimage in ${IMAGES_PNG:M/:Mshare}	293	.for _curimage in ${IMAGES_PNG:M/:Mshare}
294	${MKDIR} -p ${DESTDIR:H:H}/${_curimage:H:S\|${IMAGES_EN_DIR}/\|\|:S\|${.CURDIR}\|\|}	294	${MKDIR} ${DESTDIR:H:H}/${_curimage:H:S\|${IMAGES_EN_DIR}/\|\|:S\|${.CURDIR}\|\|}
295	${INSTALL_DOCS} ${_curimage} ${DESTDIR:H:H}/${_curimage:H:S\|${IMAGES_EN_DIR}/\|\|:S\|${.CURDIR}\|\|}	295	${INSTALL_DOCS} ${_curimage} ${DESTDIR:H:H}/${_curimage:H:S\|${IMAGES_EN_DIR}/\|\|:S\|${.CURDIR}\|\|}
296	.endfor	296	.endfor
297	.for _curimage in ${IMAGES_PNG:N/}	297	.for _curimage in ${IMAGES_PNG:N/}
Lines 303-309 Link Here
303		303
304	.for _compressext in ${KNOWN_COMPRESS}	304	.for _compressext in ${KNOWN_COMPRESS}
305	install-${_cf}.${_compressext}: ${DOC}.${_cf}.${_compressext}	305	install-${_cf}.${_compressext}: ${DOC}.${_cf}.${_compressext}
306	@[ -d ${DESTDIR} ] \|\| ${MKDIR} -p ${DESTDIR}	306	@[ -d ${DESTDIR} ] \|\| ${MKDIR} ${DESTDIR}
307	${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}	307	${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}
308	.endfor	308	.endfor
309	.endif	309	.endif