Hey,

erm, I must be doing something rather stupid, as a handbook build will fail to succeed if I run 'make obj' first.

The attached patch fixes that for me and also still works for non-OBJDIR builds.

Ok to commit?

Cheers, Uli

Index: share/mk/doc.images.mk =================================================================== RCS file: /home/dcvs/doc/share/mk/doc.images.mk,v retrieving revision 1.31 diff -u -p -r1.31 doc.images.mk --- share/mk/doc.images.mk 25 Dec 2009 18:12:00 -0000 1.31 +++ share/mk/doc.images.mk 16 Jan 2012 21:21:01 -0000 @@ -91,29 +91,10 @@ IMAGES_PNG= ${_IMAGES_PNG} ${IMAGES_GEN_ IMAGES_EPS= ${_IMAGES_EPS} ${IMAGES_GEN_EPS} ${IMAGES_SCR_EPS}
${IMAGES_PIC_EPS} IMAGES_TXT= ${_IMAGES_TXT} ${IMAGES_SCR_TXT}

-.if ${.OBJDIR} != ${.CURDIR} -LOCAL_IMAGES= ${IMAGES:S|^|${.OBJDIR}/|} -CLEANFILES+= ${LOCAL_IMAGES} - -.if !empty(_IMAGES_PNG) -LOCAL_IMAGES_PNG= ${_IMAGES_PNG:S|^|${.OBJDIR}/|} -.endif - -.if !empty(_IMAGES_EPS) -LOCAL_IMAGES_EPS= ${_IMAGES_EPS:S|^|${.OBJDIR}/|} -.endif - -.if !empty(_IMAGES_TXT) -LOCAL_IMAGES_TXT= ${_IMAGES_TXT:S|^|${.OBJDIR}/|} -.endif - -.else LOCAL_IMAGES= ${IMAGES} LOCAL_IMAGES_PNG= ${_IMAGES_PNG} LOCAL_IMAGES_EPS= ${_IMAGES_EPS} LOCAL_IMAGES_TXT= ${_IMAGES_TXT} -.endif - LOCAL_IMAGES_PNG+= ${IMAGES_GEN_PNG} ${IMAGES_SCR_PNG} ${IMAGES_PIC_PNG} LOCAL_IMAGES_EPS+= ${IMAGES_GEN_EPS} ${IMAGES_SCR_EPS} ${IMAGES_PIC_EPS} LOCAL_IMAGES_TXT+= ${IMAGES_SCR_TXT}