diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2010-10-09 19:17:49 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-10-11 15:19:41 +0100 |
| commit | 3e606e731108bc01fa7def90b94f07fcaecd64c3 (patch) | |
| tree | 5e9212f78a415f2941058282f0dac5cb43fdf15e /desktop | |
| parent | 90add52b3fdfafca8fd967a119e9371ed7f3f9bd (diff) | |
pack broffice artwork, and deliver correctly.
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/prj/d.lst | 11 | ||||
| -rw-r--r-- | desktop/zipintro/makefile.mk | 8 |
2 files changed, 7 insertions, 12 deletions
diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst index 182012c90e22..48ae58c82ccf 100644 --- a/desktop/prj/d.lst +++ b/desktop/prj/d.lst @@ -105,14 +105,9 @@ mkdir: %_DEST%\bin%_EXT%\odf4ms ..\%__SRC%\misc\nswrapper.sh %_DEST%\bin%_EXT%\nswrapper ..\%__SRC%\misc\mozwrapper.sh %_DEST%\bin%_EXT%\mozwrapper -mkdir: %COMMON_DEST%\pck%_EXT%\openoffice_dev -mkdir: %COMMON_DEST%\pck%_EXT%\openoffice_dev_nologo -mkdir: %COMMON_DEST%\pck%_EXT%\openoffice_nologo -mkdir: %COMMON_DEST%\pck%_EXT%\broffice_dev -mkdir: %COMMON_DEST%\pck%_EXT%\broffice -mkdir: %COMMON_DEST%\pck%_EXT%\broffice_dev_nologo -mkdir: %COMMON_DEST%\pck%_EXT%\broffice_nologo -..\%__SRC%\bin\brand\intro.zip %COMMON_DEST%\pck%_EXT%\intro.zip +mkdir: %COMMON_DEST%\pck%_EXT%\brand +mkdir: %COMMON_DEST%\pck%_EXT%\brand_dev +..\%__SRC%\bin\brand\intro.zip %COMMON_DEST%\pck%_EXT%\brand\intro.zip ..\%__SRC%\bin\brand_dev\intro.zip %COMMON_DEST%\pck%_EXT%\brand_dev\intro.zip ..\%__SRC%\bin\guiloader.exe %_DEST%\bin%_EXT%\testtool.exe diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk index 48fec2f92ddd..6ca9effe73a0 100644 --- a/desktop/zipintro/makefile.mk +++ b/desktop/zipintro/makefile.mk @@ -36,14 +36,14 @@ DEFAULT_FLAVOURS=brand brand_dev ZIP1LIST= \ $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/intro.png $(INTRO_BITMAPS)) \ - $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/intro-pt_BR.png \ $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/about.png $(ABOUT_BITMAPS)) \ - $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/about-pt_BR.png + $(MISC)$/$(RSCDEFIMG)$/brand$/intro-pt_BR.png \ + $(MISC)$/$(RSCDEFIMG)$/brand$/about-pt_BR.png ZIP2LIST= \ $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro.png $(INTRO_BITMAPS)) \ - $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro-pt_BR.png \ $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about.png $(ABOUT_BITMAPS)) \ - $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about-pt_BR.png + $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro-pt_BR.png \ + $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about-pt_BR.png ZIP1TARGET=brand ZIP1DEPS=$(ZIP1LIST) |