diff options
| author | Tor Lillqvist <tml@novell.com> | 2008-01-03 11:02:32 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@novell.com> | 2008-01-03 11:02:32 +0000 |
| commit | 953d335ac045a83b34819ff5fbc85bd80f87b043 (patch) | |
| tree | 6e0385e2537ce871e4eb27bf69decfb43fb5699f /Makefile.shared | |
| parent | c9ede651ebdaaff34e1cb6113ddcbcde134e6201 (diff) | |
Ignore the convert.
* Makefile.shared: Ignore the convert.exe in system32 on Windows.
Diffstat (limited to 'Makefile.shared')
| -rw-r--r-- | Makefile.shared | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.shared b/Makefile.shared index bdd5d8dda..03fc16eef 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -40,7 +40,11 @@ $(STAMP_DIR)/artwork.install : $(OOBUILDDIR)/unpack \ cp $(top_srcdir)/src/open*_*.bmp $(OOBUILDDIR)/svx/res/ || echo "no intro images to copy" 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" - which convert > /dev/null && 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 + case "`which convert`" in \ + # Ignore convert.exe in windows/system32 \ + *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 touch $@ patch.apply: $(OOBUILDDIR)/unpack $(STAMP_DIR)/patch.apply |