diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-12-21 11:52:58 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-12-21 11:52:58 +0000 |
| commit | 44786c67b916a504446338ecaa6c2d301dcdef65 (patch) | |
| tree | aed9cd5decb6b9932bc9985b352f908699c4c0e7 | |
| parent | 33ce3f4ea4eb77cf65a54c384c69d698479d5472 (diff) | |
INTEGRATION: CWS nativefixer21 (1.42.2); FILE MERGED
2005/11/28 10:24:00 is 1.42.2.5: RESYNC: (1.47-1.48); FILE MERGED
2005/11/15 17:18:27 is 1.42.2.4: RESYNC: (1.46-1.47); FILE MERGED
2005/11/10 17:49:07 is 1.42.2.3: RESYNC: (1.43-1.46); FILE MERGED
2005/10/26 09:59:08 is 1.42.2.2: RESYNC: (1.42-1.43); FILE MERGED
2005/10/24 09:21:59 is 1.42.2.1: #i56369# usage of wrong ure idt files
| -rw-r--r-- | instsetoo_native/util/makefile.mk | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index 9f146b6117c8..619aeee7ec2b 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.48 $ +# $Revision: 1.49 $ # -# last change: $Author: hjs $ $Date: 2005-11-18 16:14:01 $ +# last change: $Author: obo $ $Date: 2005-12-21 12:52:58 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -127,15 +127,18 @@ sdkoo: $(foreach,i,$(alllangiso) sdkoo_$i) MSIOFFICETEMPLATESOURCE=$(PRJ)$/inc_openoffice$/windows$/msi_templates MSILANGPACKTEMPLATESOURCE=$(PRJ)$/inc_ooolangpack$/windows$/msi_templates +MSIURETEMPLATESOURCE=$(PRJ)$/inc_ure$/windows$/msi_templates MSISDKOOTEMPLATESOURCE=$(PRJ)$/inc_sdkoo$/windows$/msi_templates .IF "$(BUILD_SPECIAL)"!="" MSIOFFICETEMPLATEDIR=$(MSIOFFICETEMPLATESOURCE) MSILANGPACKTEMPLATEDIR=$(MSILANGPACKTEMPLATESOURCE) +MSIURETEMPLATEDIR=$(MSIURETEMPLATESOURCE) MSISDKOOTEMPLATEDIR=$(MSISDKOOTEMPLATESOURCE) .ELSE # "$(BUILD_SPECIAL)"!="" NOLOGOSPLASH:=$(BIN)$/intro.bmp MSIOFFICETEMPLATEDIR=$(MISC)$/openoffice$/msi_templates MSILANGPACKTEMPLATEDIR=$(MISC)$/ooolangpack$/msi_templates +MSIURETEMPLATEDIR=$(MISC)$/ure$/msi_templates MSISDKOOTEMPLATEDIR=$(MISC)$/sdkoo$/msi_templates ADDDEPS=$(NOLOGOSPLASH) hack_msitemplates @@ -221,7 +224,7 @@ ure_en-US: $(MISC)$/ure$/services.rdb +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst \ -l en-US -p URE -u $(OUT) -buildid $(BUILD) $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH)) \ -packagelist $(PRJ)$/inc_ure$/unix$/packagelist.txt \ - -msitemplate $(MSILANGPACKTEMPLATEDIR) \ + -msitemplate $(MSIURETEMPLATEDIR) \ -msilanguage $(COMMONMISC)$/win_ulffiles .IF "$(USE_SHELL)"!="4nt" @@ -346,14 +349,18 @@ $(BIN)$/intro.bmp : $(SOLARCOMMONPCKDIR)$/openoffice$/nologointro.bmp hack_msitemplates .PHONY: +-$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR) +-$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR) + +-$(MKDIRHIER) $(MSIURETEMPLATEDIR) +-$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR) $(GNUCOPY) -ua $(MSIOFFICETEMPLATESOURCE) $(MSIOFFICETEMPLATEDIR:d:d) $(GNUCOPY) -ua $(MSILANGPACKTEMPLATESOURCE) $(MSILANGPACKTEMPLATEDIR:d:d) + $(GNUCOPY) -ua $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d) $(GNUCOPY) -ua $(MSISDKOOTEMPLATESOURCE) $(MSISDKOOTEMPLATEDIR:d:d) +$(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp +$(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp + +$(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp +$(RM) $(MSISDKOOTEMPLATEDIR)$/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 |