diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2008-08-13 08:46:14 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2008-08-13 08:46:14 +0000 |
| commit | 17b324abb06fa4bc4d1a7bb9f82fc881e64fd568 (patch) | |
| tree | c3476dfa96aa128cc4a0a85ee1cfb349ebf307b2 /Makefile.shared | |
| parent | cfa5452213959d5f3adc0fa451d674df88c13784 (diff) | |
Start of re-factor of cut/paste flags work in Makefile.
* bin/applyflags: start of re-factor of cut/paste flags
work in Makefile.shared.
* bin/piece/install-artwork: rename to inst-artwork,
* bin/piece/Makefile.am, bin/Makefile.am: update.
2008-08-12 Michael Meeks <michael.meeks@novell.com>
* bin/install-artwork, Makefile.shared: make artwork
installation rather more generic.
Diffstat (limited to 'Makefile.shared')
| -rw-r--r-- | Makefile.shared | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/Makefile.shared b/Makefile.shared index 6dadda9e7..e3a396e06 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -48,33 +48,7 @@ $(STAMP_DIR)/artwork.install : $(OOBUILDDIR)/unpack \ $(STAMP_DIR)/prebuild \ $(wildcard $(top_srcdir)/src/*.png) \ $(wildcard $(top_srcdir)/src/*.bmp) - 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 - 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 - tar -C $(top_srcdir)/src/layout --exclude=.svn -cf- default_images ooo_custom_images | tar -C $(OOBUILDDIR) -xf- + $(TOOLSDIR)/bin/install-artwork $(top_srcdir)/src $(OOBUILDDIR) touch $@ patch.apply: $(OOBUILDDIR)/unpack $(STAMP_DIR)/patch.apply |