images separation: en_US -> share breakage

[Alexey Zelkin]

hi,

Hmm...  Attached patch fixed problem for me.  I have reviewed generated
content and see no problems with images.  There're some other problems
with some pages, but it's different story and fixes will be committed
soon.

On Tue, Jun 24, 2003 at 12:10:12AM +0200, Simon L. Nielsen wrote:
> On 2003.06.24 00:50:05 +0300, Alexey Zelkin wrote:
> 
> > back in april you have moved images from en_US.ISO8859-1 directory
> > to share.  This commit caused breakage in ${.CURDIR} != ${.OBJDIR}
> > environment.
> 
> This is a known problem, but unfortunatly not simple to fix.  I did make
> a partial fix, but it didn't really work in all situations.
> 
> I'm working on a larger update of the doc/ build system (were one of the
> primary goals is making building with OBJDIR work "right"), but it will
> take some time before this is in any working state.
> 
> For now, I don't think there any other way than to build without using
> /usr/obj.
> 
> -- 
> Simon L. Nielsen


-------------- next part --------------
Index: doc.images.mk
===================================================================
RCS file: /home/ncvs/doc/share/mk/doc.images.mk,v
retrieving revision 1.22
diff -u -r1.22 doc.images.mk
--- doc.images.mk	11 Apr 2003 09:21:15 -0000	1.22
+++ doc.images.mk	24 Jun 2003 10:15:11 -0000
@@ -61,35 +61,15 @@
 .endfor
 
 _IMAGES_PNG= ${IMAGES:M*.png}
-_IMAGES_PNG+= ${LOCAL_IMAGES_EN:M*.png}
+_IMAGES_PNG2= ${LOCAL_IMAGES_EN:M*.png}
 _IMAGES_EPS= ${IMAGES:M*.eps}
-_IMAGES_EPS+= ${LOCAL_IMAGES_EN:M*.eps}
+_IMAGES_EPS2= ${LOCAL_IMAGES_EN:M*.eps}
 _IMAGES_SCR= ${IMAGES:M*.scr}
-_IMAGES_SCR+= ${LOCAL_IMAGES_EN:M*.scr}
+_IMAGES_SCR2= ${LOCAL_IMAGES_EN:M*.scr}
 _IMAGES_TXT= ${IMAGES:M*.txt}
-_IMAGES_TXT+= ${LOCAL_IMAGES_EN:M*.txt}
+_IMAGES_TXT2= ${LOCAL_IMAGES_EN:M*.txt}
 _IMAGES_PIC= ${IMAGES:M*.pic}
-_IMAGES_PIC+= ${LOCAL_IMAGES_EN:M*.pic}
-
-IMAGES_GEN_PNG= ${_IMAGES_EPS:S/.eps$/.png/}
-IMAGES_GEN_EPS= ${_IMAGES_PNG:S/.png$/.eps/}
-IMAGES_GEN_PDF= ${_IMAGES_EPS:S/.eps$/.pdf/}
-IMAGES_SCR_PNG= ${_IMAGES_SCR:S/.scr$/.png/}
-IMAGES_SCR_EPS= ${_IMAGES_SCR:S/.scr$/.eps/}
-IMAGES_SCR_PDF= ${_IMAGES_SCR:S/.scr$/.pdf/}
-IMAGES_SCR_TXT= ${_IMAGES_SCR:S/.scr$/.txt/}
-IMAGES_PIC_PNG= ${_IMAGES_PIC:S/.pic$/.png/}
-IMAGES_PIC_EPS= ${_IMAGES_PIC:S/.pic$/.eps/}
-IMAGES_PIC_PDF= ${_IMAGES_PIC:S/.pic$/.pdf/}
-IMAGES_GEN_PDF+= ${IMAGES_PIC_PDF} ${IMAGES_SCR_PDF}
-
-CLEANFILES+= ${IMAGES_GEN_PNG} ${IMAGES_GEN_EPS} ${IMAGES_GEN_PDF}
-CLEANFILES+= ${IMAGES_SCR_PNG} ${IMAGES_SCR_EPS} ${IMAGES_SCR_TXT}
-CLEANFILES+= ${IMAGES_PIC_PNG} ${IMAGES_PIC_EPS} ${_IMAGES_PIC:S/.pic$/.ps/}
-
-IMAGES_PNG= ${_IMAGES_PNG} ${IMAGES_GEN_PNG} ${IMAGES_SCR_PNG} ${IMAGES_PIC_PNG}
-IMAGES_EPS= ${_IMAGES_EPS} ${IMAGES_GEN_EPS} ${IMAGES_SCR_EPS} ${IMAGES_PIC_EPS}
-IMAGES_TXT= ${_IMAGES_TXT} ${IMAGES_SCR_TXT}
+_IMAGES_PIC2= ${LOCAL_IMAGES_EN:M*.pic}
 
 .if ${.OBJDIR} != ${.CURDIR}
 LOCAL_IMAGES= ${IMAGES:S|^|${.OBJDIR}/|}
@@ -113,6 +93,36 @@
 LOCAL_IMAGES_EPS= ${_IMAGES_EPS}
 LOCAL_IMAGES_TXT= ${_IMAGES_TXT}
 .endif
+
+_IMAGES_PNG+= ${_IMAGES_PNG2}
+_IMAGES_EPS+= ${_IMAGES_EPS2}
+_IMAGES_SCR+= ${_IMAGES_SCR2}
+_IMAGES_TXT+= ${_IMAGES_TXT2}
+_IMAGES_PIC+= ${_IMAGES_PIC2}
+
+LOCAL_IMAGES_PNG+= ${_IMAGES_PNG2}
+LOCAL_IMAGES_EPS+= ${_IMAGES_EPS2}
+LOCAL_IMAGES_TXT+= ${_IMAGES_TXT2}
+
+IMAGES_GEN_PNG= ${_IMAGES_EPS:S/.eps$/.png/}
+IMAGES_GEN_EPS= ${_IMAGES_PNG:S/.png$/.eps/}
+IMAGES_GEN_PDF= ${_IMAGES_EPS:S/.eps$/.pdf/}
+IMAGES_SCR_PNG= ${_IMAGES_SCR:S/.scr$/.png/}
+IMAGES_SCR_EPS= ${_IMAGES_SCR:S/.scr$/.eps/}
+IMAGES_SCR_PDF= ${_IMAGES_SCR:S/.scr$/.pdf/}
+IMAGES_SCR_TXT= ${_IMAGES_SCR:S/.scr$/.txt/}
+IMAGES_PIC_PNG= ${_IMAGES_PIC:S/.pic$/.png/}
+IMAGES_PIC_EPS= ${_IMAGES_PIC:S/.pic$/.eps/}
+IMAGES_PIC_PDF= ${_IMAGES_PIC:S/.pic$/.pdf/}
+IMAGES_GEN_PDF+= ${IMAGES_PIC_PDF} ${IMAGES_SCR_PDF}
+
+CLEANFILES+= ${IMAGES_GEN_PNG} ${IMAGES_GEN_EPS} ${IMAGES_GEN_PDF}
+CLEANFILES+= ${IMAGES_SCR_PNG} ${IMAGES_SCR_EPS} ${IMAGES_SCR_TXT}
+CLEANFILES+= ${IMAGES_PIC_PNG} ${IMAGES_PIC_EPS} ${_IMAGES_PIC:S/.pic$/.ps/}
+
+IMAGES_PNG= ${_IMAGES_PNG} ${IMAGES_GEN_PNG} ${IMAGES_SCR_PNG} ${IMAGES_PIC_PNG}
+IMAGES_EPS= ${_IMAGES_EPS} ${IMAGES_GEN_EPS} ${IMAGES_SCR_EPS} ${IMAGES_PIC_EPS}
+IMAGES_TXT= ${_IMAGES_TXT} ${IMAGES_SCR_TXT}
 
 LOCAL_IMAGES_PNG+= ${IMAGES_GEN_PNG} ${IMAGES_SCR_PNG} ${IMAGES_PIC_PNG}
 LOCAL_IMAGES_EPS+= ${IMAGES_GEN_EPS} ${IMAGES_SCR_EPS} ${IMAGES_PIC_EPS}