diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-01-02 15:17:33 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-01-02 15:17:33 +0000 |
commit | 70b22562c01033d9d1bd3e43247689fb3fd440c6 (patch) | |
tree | fbd234653a14ea8e062ee0e169eed1498672cfac /desktop/util | |
parent | 25cb82747be59d8244de35d05494d22e4ee2261d (diff) |
INTEGRATION: CWS vistaready01 (1.64.38); FILE MERGED
2006/11/14 12:48:15 lla 1.64.38.1: #i70927# add manifest
Diffstat (limited to 'desktop/util')
-rw-r--r-- | desktop/util/makefile.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index 77fc74e417ed..07646252823c 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.64 $ +# $Revision: 1.65 $ # -# last change: $Author: vg $ $Date: 2006-09-25 13:19:09 $ +# last change: $Author: hr $ $Date: 2007-01-02 16:17:33 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -244,6 +244,7 @@ $(APP1TARGETN) : $(BIN)$/so .IF "$(GUI)" == "WNT" ALLTAR: $(MISC)$/$(TARGET).exe.manifest +ALLTAR: $(MISC)$/$(TARGET).bin.manifest ALLTAR: $(BIN)$/$(TARGET).bin ALLTAR: $(BIN)$/so$/$(TARGET).bin .ENDIF # WNT @@ -264,6 +265,11 @@ ALLTAR : $(BIN)$/so$/soffice_so$(EXECPOST) $(BIN)$/soffice_oo$(EXECPOST) $(MISC)$/$(TARGET).exe.manifest: template.manifest +$(COPY) $< $@ +# create a manifest file with the same name as the +# office executable file soffice.bin.manifest +$(MISC)$/$(TARGET).bin.manifest: template.manifest + +$(COPY) $< $@ + $(BIN)$/$(TARGET).bin: $(BIN)$/$(TARGET)$(EXECPOST) +$(COPY) $< $@ |