diff options
| author | Thorsten Behrens <tbehrens@suse.com> | 2011-11-24 13:39:57 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2011-11-24 21:43:05 +0100 |
| commit | 23e1476c9309042d4e6246b57feb829f675d9f5a (patch) | |
| tree | 9ca5676b10f20c080ccbee5a6e62e0644ad55b6e /instsetoo_native/util | |
| parent | 50171e51373800bfe598e461d551f873aff87f09 (diff) | |
Cleanup: remove unused artwork, consolidate remaining.
* the *.ico files were simply copied around, for the msi templates,
and then later customized by copying nologobanner/install onto
them
* now holding only one copy of the icons, removed later-deleted
other *.bmp files
Diffstat (limited to 'instsetoo_native/util')
| -rw-r--r-- | instsetoo_native/util/makefile.mk | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index b2cc69eb804d..6f2643db2433 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -182,6 +182,7 @@ MSILANGPACKTEMPLATESOURCE=$(PRJ)$/inc_ooolangpack$/windows$/msi_templates MSIHELPPACKTEMPLATESOURCE=$(PRJ)$/inc_ooohelppack$/windows$/msi_templates MSIURETEMPLATESOURCE=$(PRJ)$/inc_ure$/windows$/msi_templates MSISDKOOTEMPLATESOURCE=$(PRJ)$/inc_sdkoo$/windows$/msi_templates +MSICOMMONTEMPLATESOURCE=$(PRJ)$/inc_common$/windows$/msi_templates NOLOGOSPLASH:=$(BIN)$/intro.zip DEVNOLOGOSPLASH:=$(BIN)$/dev$/intro.zip @@ -350,21 +351,11 @@ hack_msitemplates .PHONY: $(GNUCOPY) -u $(MSIHELPPACKTEMPLATESOURCE)$/*.* $(MSIHELPPACKTEMPLATEDIR) $(GNUCOPY) -u $(MSIURETEMPLATESOURCE)$/*.* $(MSIURETEMPLATEDIR) $(GNUCOPY) -u $(MSISDKOOTEMPLATESOURCE)$/*.* $(MSISDKOOTEMPLATEDIR) - $(GNUCOPY) -u $(MSIOFFICETEMPLATESOURCE)$/Binary$/*.* $(MSIOFFICETEMPLATEDIR)$/Binary - $(GNUCOPY) -u $(MSILANGPACKTEMPLATESOURCE)$/Binary$/*.* $(MSILANGPACKTEMPLATEDIR)$/Binary - $(GNUCOPY) -u $(MSIHELPPACKTEMPLATESOURCE)$/Binary$/*.* $(MSIHELPPACKTEMPLATEDIR)$/Binary - $(GNUCOPY) -u $(MSIURETEMPLATESOURCE)$/Binary$/*.* $(MSIURETEMPLATEDIR)$/Binary - $(GNUCOPY) -u $(MSISDKOOTEMPLATESOURCE)$/Binary$/*.* $(MSISDKOOTEMPLATEDIR)$/Binary - $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp - $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp - $(RM) $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Image.bmp - $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp - $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp - $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp - $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp - $(RM) $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Banner.bmp - $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp - $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp + $(GNUCOPY) -u $(MSICOMMONTEMPLATESOURCE)$/Binary$/*.* $(MSIOFFICETEMPLATEDIR)$/Binary + $(GNUCOPY) -u $(MSICOMMONTEMPLATESOURCE)$/Binary$/*.* $(MSILANGPACKTEMPLATEDIR)$/Binary + $(GNUCOPY) -u $(MSICOMMONTEMPLATESOURCE)$/Binary$/*.* $(MSIHELPPACKTEMPLATEDIR)$/Binary + $(GNUCOPY) -u $(MSICOMMONTEMPLATESOURCE)$/Binary$/*.* $(MSIURETEMPLATEDIR)$/Binary + $(GNUCOPY) -u $(MSICOMMONTEMPLATESOURCE)$/Binary$/*.* $(MSISDKOOTEMPLATEDIR)$/Binary $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Image.bmp |