diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-02-28 15:28:51 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-02-28 15:28:51 +0000 |
| commit | e9a81119b0b8800e5fa9f7ff8727271e8d53085d (patch) | |
| tree | e9b586516d885a936c450a5942efd178fd849592 /desktop/util | |
| parent | 49b8252d157cd5d2b25ebd0d9adfd3337b6d7dd1 (diff) | |
INTEGRATION: CWS obo09 (1.65.20); FILE MERGED
2007/02/12 10:54:35 obo 1.65.20.2: RESYNC: (1.65-1.67); FILE MERGED
2007/02/07 14:51:32 obo 1.65.20.1: #i74208# Port for .NET 2005 Professional Edition, merge template manifest with linker manifest
Diffstat (limited to 'desktop/util')
| -rw-r--r-- | desktop/util/makefile.mk | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index 6f63c2a6f4..1738b80fb6 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.67 $ +# $Revision: 1.68 $ # -# last change: $Author: vg $ $Date: 2007-02-06 14:08:42 $ +# last change: $Author: vg $ $Date: 2007-02-28 16:28:51 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -262,13 +262,29 @@ ALLTAR : $(BIN)$/so$/soffice_so$(EXECPOST) $(BIN)$/soffice_oo$(EXECPOST) # create a manifest file with the same name as the # office executable file soffice.exe.manifest +.IF "$(CCNUMVER)" <= "001399999999" $(MISC)$/$(TARGET).exe.manifest: template.manifest $(COPY) $< $@ +.ELSE +$(MISC)$/$(TARGET).exe.template.manifest: template.manifest + $(COPY) $< $@ + +$(MISC)$/$(TARGET).exe.linker.manifest: $(BIN)$/$(TARGET)$(EXECPOST) + mt.exe -inputresource:$(BIN)$/$(TARGET)$(EXECPOST) -out:$@ + +$(MISC)$/$(TARGET).exe.manifest: $(MISC)$/$(TARGET).exe.template.manifest $(MISC)$/$(TARGET).exe.linker.manifest + mt.exe -manifest $(MISC)$/$(TARGET).exe.linker.manifest $(MISC)$/$(TARGET).exe.template.manifest -out:$@ +.ENDIF # create a manifest file with the same name as the -# office executable file soffice.bin.manifest +# office executable file soffice.bin.manifest +.IF "$(CCNUMVER)" <= "001399999999" $(MISC)$/$(TARGET).bin.manifest: template.manifest $(COPY) $< $@ +.ELSE +$(MISC)$/$(TARGET).bin.manifest: $(MISC)$/$(TARGET).exe.manifest + $(COPY) $(MISC)$/$(TARGET).exe.manifest $@ +.ENDIF $(BIN)$/$(TARGET).bin: $(BIN)$/$(TARGET)$(EXECPOST) $(COPY) $< $@ @@ -286,3 +302,4 @@ $(MISCX)$/$(APP1TARGET).def : makefile.mk $(BIN)$/so: makefile.mk @echo APP5 : $(APP5TARGET) @@-$(MKDIR) $(BIN)$/so + |