diff options
| author | hg <hg@oosvn01.> | 2009-10-08 15:46:11 +0000 |
|---|---|---|
| committer | hg <hg@oosvn01.> | 2009-10-08 15:46:11 +0000 |
| commit | a9b564e3c5695e9cbb7f929e0c4eaa87b998ccde (patch) | |
| tree | 6683b8b2075beda5ea3335ad9cb4db00653f898f /instsetoo_native | |
| parent | 4eaaf79e9aa1b2b82cb40b0b6bbba5d07d71258c (diff) | |
| parent | 02dc0bda41a02b2dbb5880c4512c7347cc32e394 (diff) | |
merge with m50
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/util/makefile.mk | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index d7cee0a598df..d819d6045816 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -169,7 +169,6 @@ MSIOFFICETEMPLATEDIR=$(MSIOFFICETEMPLATESOURCE) MSILANGPACKTEMPLATEDIR=$(MSILANGPACKTEMPLATESOURCE) MSIURETEMPLATEDIR=$(MSIURETEMPLATESOURCE) MSISDKOOTEMPLATEDIR=$(MSISDKOOTEMPLATESOURCE) -#MSIURETEMPLATEDIR=$(MSIURETEMPLATESOURCE) .ELSE # "$(BUILD_SPECIAL)"!="" NOLOGOSPLASH:=$(BIN)$/intro.zip DEVNOLOGOSPLASH:=$(BIN)$/dev$/intro.zip @@ -381,21 +380,25 @@ hack_msitemplates .PHONY: -$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR) -$(MKDIRHIER) $(MSIURETEMPLATEDIR) -$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR) -# -$(MKDIRHIER) $(MSIURETEMPLATEDIR) - $(GNUCOPY) -ua $(MSIOFFICETEMPLATESOURCE) $(MSIOFFICETEMPLATEDIR:d:d) - $(GNUCOPY) -ua $(MSILANGPACKTEMPLATESOURCE) $(MSILANGPACKTEMPLATEDIR:d:d) - $(GNUCOPY) -ua $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d) - $(GNUCOPY) -ua $(MSISDKOOTEMPLATESOURCE) $(MSISDKOOTEMPLATEDIR:d:d) -# $(GNUCOPY) -ua $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d) + -$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)$/Binary + -$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)$/Binary + -$(MKDIRHIER) $(MSIURETEMPLATEDIR)$/Binary + -$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)$/Binary + $(GNUCOPY) -u $(MSIOFFICETEMPLATESOURCE)$/*.* $(MSIOFFICETEMPLATEDIR) + $(GNUCOPY) -u $(MSILANGPACKTEMPLATESOURCE)$/*.* $(MSILANGPACKTEMPLATEDIR) + $(GNUCOPY) -u $(MSIURETEMPLATESOURCE)$/*.* $(MSIURETEMPLATEDIR) + $(GNUCOPY) -u $(MSISDKOOTEMPLATESOURCE)$/*.* $(MSISDKOOTEMPLATEDIR) + $(GNUCOPY) -u $(MSIOFFICETEMPLATESOURCE)$/Binary$/*.* $(MSIOFFICETEMPLATEDIR)$/Binary + $(GNUCOPY) -u $(MSILANGPACKTEMPLATESOURCE)$/Binary$/*.* $(MSILANGPACKTEMPLATEDIR)$/Binary + $(GNUCOPY) -u $(MSIURETEMPLATESOURCE)$/Binary$/*.* $(MSIURETEMPLATEDIR)$/Binary + $(GNUCOPY) -u $(MSISDKOOTEMPLATESOURCE)$/Binary$/*.* $(MSISDKOOTEMPLATEDIR)$/Binary $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp -# $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp -# $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp |