diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-25 14:28:32 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-25 14:28:32 +0000 |
| commit | 854fc2ae676f4cabafe2af8d179fa65a1fb5cfbf (patch) | |
| tree | 6e899dc72c37655a0adb0267b153dbbfc55f9162 /desktop/util | |
| parent | 13dabbe3edcca0c035ace987b877bd8b8aa76eaa (diff) | |
INTEGRATION: CWS ause069 (1.64.16); FILE MERGED
2007/01/17 14:34:13 hjs 1.64.16.3: #i70359# no forced shell required here
2007/01/10 23:55:25 hjs 1.64.16.2: RESYNC: (1.64-1.65); FILE MERGED
2006/10/18 17:10:34 hjs 1.64.16.1: #i70359# remove forced shell calls
Diffstat (limited to 'desktop/util')
| -rw-r--r-- | desktop/util/makefile.mk | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index 07646252823c..af483b8865f9 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.65 $ +# $Revision: 1.66 $ # -# last change: $Author: hr $ $Date: 2007-01-02 16:17:33 $ +# last change: $Author: obo $ $Date: 2007-01-25 15:28:32 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -163,7 +163,7 @@ APP1STACK=10000000 # create a manifest file with the same name as the #office executable file soffice.exe.manifest #$(BIN)$/$(TARGET).exe.manifest: template.manifest -#+$(COPY) $< $@ +#$(COPY) $< $@ .ENDIF # WNT @@ -250,10 +250,10 @@ ALLTAR: $(BIN)$/so$/$(TARGET).bin .ENDIF # WNT $(BIN)$/soffice_oo$(EXECPOST) : $(APP5TARGETN) - +$(COPY) $< $@ + $(COPY) $< $@ $(BIN)$/so$/soffice_so$(EXECPOST) : $(APP1TARGETN) - +$(COPY) $< $@ + $(COPY) $< $@ ALLTAR : $(BIN)$/so$/soffice_so$(EXECPOST) $(BIN)$/soffice_oo$(EXECPOST) @@ -263,18 +263,18 @@ 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 $(MISC)$/$(TARGET).exe.manifest: template.manifest - +$(COPY) $< $@ + $(COPY) $< $@ # create a manifest file with the same name as the # office executable file soffice.bin.manifest $(MISC)$/$(TARGET).bin.manifest: template.manifest - +$(COPY) $< $@ + $(COPY) $< $@ $(BIN)$/$(TARGET).bin: $(BIN)$/$(TARGET)$(EXECPOST) - +$(COPY) $< $@ + $(COPY) $< $@ $(BIN)$/so$/$(TARGET).bin: $(BIN)$/so$/$(TARGET)$(EXECPOST) - +$(COPY) $< $@ + $(COPY) $< $@ $(MISCX)$/$(APP1TARGET).def : makefile.mk echo NAME soffice >$@ @@ -285,4 +285,4 @@ $(MISCX)$/$(APP1TARGET).def : makefile.mk $(BIN)$/so: makefile.mk @echo APP5 : $(APP5TARGET) - @+-mkdir $(BIN)$/so >& $(NULLDEV) + @-mkdir $(BIN)$/so >& $(NULLDEV) |