diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2008-06-30 16:02:36 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2008-06-30 16:02:36 +0000 |
| commit | 1376e3f92dce15fcdb6cb2a46c320b821a475730 (patch) | |
| tree | f9bf48bbc00e653b78de252cf608123a8ed6d0e6 /Makefile.shared | |
| parent | 46bcb397674c3ef662013124c6c37b31ed06c9d2 (diff) | |
Add piece capability.
* bin/package_ooo: add piece capability.
* configure.in, bin/Makefile.am, bin/piece/Makefile.am,
* bin/piece/build-bootstrap, build-install, build-ure: add.
* Makefile.shared (artwork.install): make more directories if
they are not there (build in pieces), and don't convert if
introabout not present.
Diffstat (limited to 'Makefile.shared')
| -rw-r--r-- | Makefile.shared | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/Makefile.shared b/Makefile.shared index c01f9c629..1d4d6a05a 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -46,20 +46,29 @@ $(STAMP_DIR)/artwork.install : $(OOBUILDDIR)/unpack \ $(STAMP_DIR)/prebuild \ $(wildcard $(top_srcdir)/src/*.png) \ $(wildcard $(top_srcdir)/src/*.bmp) - mkdir -p $(OOBUILDDIR)/svx/res + mkdir -p $(OOBUILDDIR)/setup_native/source/win32/nsis cp $(top_srcdir)/src/ooobitmap_*.bmp $(OOBUILDDIR)/setup_native/source/win32/nsis/ || echo "no nsis installer images to copy" cp $(top_srcdir)/src/ooobanner_*.bmp $(OOBUILDDIR)/setup_native/source/win32/nsis/ || echo "no nsis banner images to copy" cp $(top_srcdir)/src/ooosetup_*.ico $(OOBUILDDIR)/setup_native/source/win32/nsis/ || echo "no installer icon to copy" + mkdir -p $(OOBUILDDIR)/instsetoo_native/res cp $(top_srcdir)/src/nologoinstall_*.bmp $(OOBUILDDIR)/instsetoo_native/res/ || echo "no installer sidebar images to copy" cp $(top_srcdir)/src/banner_*.bmp $(OOBUILDDIR)/instsetoo_native/res/ || echo "no installer banner images to copy" + mkdir -p $(OOBUILDDIR)/svx/res cp $(top_srcdir)/src/open*_*.bmp $(OOBUILDDIR)/svx/res/ || echo "no intro images to copy" + mkdir -p $(OOBUILDDIR)/default_images/svx/res + mkdir -p $(OOBUILDDIR)/default_images/sw/res cp $(top_srcdir)/src/open*_*.png $(OOBUILDDIR)/default_images/svx/res/ || echo "no about images to copy" cp $(top_srcdir)/src/*-team.png $(OOBUILDDIR)/default_images/sw/res/ || echo "no team images to copy" # Ignore convert.exe in windows/system32 - case "`which convert`" in \ - *32/convert) ;; \ - /*) mv $(OOBUILDDIR)/default_images/introabout/intro.bmp $(OOBUILDDIR)/default_images/introabout/intro-save.bmp && convert $(OOBUILDDIR)/default_images/introabout/intro-save.bmp -depth 24 -type TrueColor $(OOBUILDDIR)/default_images/introabout/intro.bmp ;; \ - esac + if test -d $(OOBUILDDIR)/default_images/introabout; then \ + case "`which convert`" in \ + *32/convert) ;; \ + /*) mv $(OOBUILDDIR)/default_images/introabout/intro.bmp $(OOBUILDDIR)/default_images/introabout/intro-save.bmp && convert $(OOBUILDDIR)/default_images/introabout/intro-save.bmp -depth 24 -type TrueColor $(OOBUILDDIR)/default_images/introabout/intro.bmp ;; \ + esac \ + fi + mkdir -p $(OOBUILDDIR)/default_images/res/commandimagelist + mkdir -p $(OOBUILDDIR)/ooo_custom_images/industrial/res/commandimagelist + mkdir -p $(OOBUILDDIR)/ooo_custom_images/tango/res/commandimagelist cp $(top_srcdir)/src/layout/*.png $(OOBUILDDIR)/default_images/res/commandimagelist cp $(top_srcdir)/src/layout/*.png $(OOBUILDDIR)/ooo_custom_images/industrial/res/commandimagelist cp $(top_srcdir)/src/layout/*.png $(OOBUILDDIR)/ooo_custom_images/tango/res/commandimagelist |