View | Details | Raw Unified | Return to issue 78506
Collapse All | Expand All

(-)makefile.mk (-11 / +2 lines)
Lines 41-47 Link Here
41
41
42
.INCLUDE :  settings.mk
42
.INCLUDE :  settings.mk
43
43
44
DEFAULT_FLAVOURS=dev dev_nologo nologo broffice dev_broffice
44
DEFAULT_FLAVOURS=dev dev_nologo nologo broffice dev_broffice intro
45
45
46
ZIP1LIST= \
46
ZIP1LIST= \
47
	$(null,$(INTRO_BITMAPS) $(SOLARSRC)$/ooo_custom_images$/dev$/introabout$/intro.bmp $(INTRO_BITMAPS)) \
47
	$(null,$(INTRO_BITMAPS) $(SOLARSRC)$/ooo_custom_images$/dev$/introabout$/intro.bmp $(INTRO_BITMAPS)) \
Lines 68-74 Link Here
68
68
69
ZIP3TARGET=nologo_intro
69
ZIP3TARGET=nologo_intro
70
70
71
ZIP4TARGET=intro
71
ZIP4TARGET=intro_intro
72
72
73
ZIP5TARGET=dev_broffice_intro
73
ZIP5TARGET=dev_broffice_intro
74
74
Lines 78-92 Link Here
78
78
79
ALLTAR : $(foreach,i,$(DEFAULT_FLAVOURS) $(COMMONBIN)$/$i$/intro.zip)
79
ALLTAR : $(foreach,i,$(DEFAULT_FLAVOURS) $(COMMONBIN)$/$i$/intro.zip)
80
80
81
#TODO: rewrite deps when ZIP1DEPS are available...
82
.IF "$(ZIP1TARGETN)"!=""
83
$(ZIP1TARGETN) $(ZIP2TARGETN) $(ZIP3TARGETN) $(ZIP4TARGETN) $(ZIP5TARGETN) $(ZIP6TARGETN) : $(MISC)$/make_zip_dests.done
84
.ENDIF			# "$(ZIP1TARGETN)"!=""
85
86
# make dirs for various flavours of "default" OOo
87
$(MISC)$/make_zip_dests.done :
88
	@@-$(MKDIR) $(foreach,i,$(DEFAULT_FLAVOURS) $(COMMONBIN)$/$i) && $(TOUCH) $@
89
90
# now duplicate for deliver...
81
# now duplicate for deliver...
91
$(COMMONBIN)$/%$/intro.zip : $(COMMONBIN)$/%_intro.zip
82
$(COMMONBIN)$/%$/intro.zip : $(COMMONBIN)$/%_intro.zip
92
	@@-$(MKDIR) $(@:d)
83
	@@-$(MKDIR) $(@:d)

Return to issue 78506