Index: makefile.mk =================================================================== RCS file: /cvs/framework/desktop/zipintro/makefile.mk,v retrieving revision 1.2 diff -u -r1.2 makefile.mk --- makefile.mk 11 Jun 2007 14:03:57 -0000 1.2 +++ makefile.mk 19 Jun 2007 10:39:54 -0000 @@ -41,7 +41,7 @@ .INCLUDE : settings.mk -DEFAULT_FLAVOURS=dev dev_nologo nologo broffice dev_broffice +DEFAULT_FLAVOURS=dev dev_nologo nologo broffice dev_broffice intro ZIP1LIST= \ $(null,$(INTRO_BITMAPS) $(SOLARSRC)$/ooo_custom_images$/dev$/introabout$/intro.bmp $(INTRO_BITMAPS)) \ @@ -68,7 +68,7 @@ ZIP3TARGET=nologo_intro -ZIP4TARGET=intro +ZIP4TARGET=intro_intro ZIP5TARGET=dev_broffice_intro @@ -78,15 +78,6 @@ ALLTAR : $(foreach,i,$(DEFAULT_FLAVOURS) $(COMMONBIN)$/$i$/intro.zip) -#TODO: rewrite deps when ZIP1DEPS are available... -.IF "$(ZIP1TARGETN)"!="" -$(ZIP1TARGETN) $(ZIP2TARGETN) $(ZIP3TARGETN) $(ZIP4TARGETN) $(ZIP5TARGETN) $(ZIP6TARGETN) : $(MISC)$/make_zip_dests.done -.ENDIF # "$(ZIP1TARGETN)"!="" - -# make dirs for various flavours of "default" OOo -$(MISC)$/make_zip_dests.done : - @@-$(MKDIR) $(foreach,i,$(DEFAULT_FLAVOURS) $(COMMONBIN)$/$i) && $(TOUCH) $@ - # now duplicate for deliver... $(COMMONBIN)$/%$/intro.zip : $(COMMONBIN)$/%_intro.zip @@-$(MKDIR) $(@:d)