diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-02-06 13:01:02 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-02-06 13:01:02 +0000 |
| commit | 337142b3fbdd10afb0df741dec67701060da636e (patch) | |
| tree | 86fd61ff684ed198addeb610ffd08c88467caf50 /solenv/inc/tg_scp.mk | |
| parent | fd64cb48f52b10572f00701ed53647cfec6aa264 (diff) | |
INTEGRATION: CWS ause074 (1.16.8); FILE MERGED
2007/02/02 11:51:33 hjs 1.16.8.1: #i74085# avoid useless shell calls
Diffstat (limited to 'solenv/inc/tg_scp.mk')
| -rw-r--r-- | solenv/inc/tg_scp.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/solenv/inc/tg_scp.mk b/solenv/inc/tg_scp.mk index 34f248eeb31d..7849d414fa74 100644 --- a/solenv/inc/tg_scp.mk +++ b/solenv/inc/tg_scp.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_scp.mk,v $ # -# $Revision: 1.16 $ +# $Revision: 1.17 $ # -# last change: $Author: obo $ $Date: 2007-01-25 12:56:35 $ +# last change: $Author: vg $ $Date: 2007-02-06 14:01:02 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -41,7 +41,7 @@ # try to get missing parfiles $(PAR)$/%.par : $(SOLARPARDIR)$/%.par - @-$(MKDIRHIER) $(@:d:d) >& $(NULLDEV) + @@-$(MKDIRHIER) $(@:d:d) $(COPY) $< $@ LOCALSCP$(TNR)FILES=$(foreach,i,$(SCP$(TNR)FILES) $(foreach,j,$(SCP$(TNR)LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i )) @@ -49,7 +49,7 @@ LOCALSCP$(TNR)FILES=$(foreach,i,$(SCP$(TNR)FILES) $(foreach,j,$(SCP$(TNR)LINK_PR $(SCP$(TNR)TARGETN): $(LOCALSCP$(TNR)FILES) @echo ------------------------------ @echo Making: $@ - @-$(MKDIRHIER) $(BIN)$/$(SCP$(TNR)LINK_PRODUCT_TYPE) >& $(NULLDEV) + @@-$(MKDIRHIER) $(BIN)$/$(SCP$(TNR)LINK_PRODUCT_TYPE) $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP$(TNR)FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@ .ENDIF |