diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-25 14:32:01 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-25 14:32:01 +0000 |
| commit | 015d2f849f537ec619bf39c9748c924c5c2b2e8f (patch) | |
| tree | 931d5e1928f44d7f3798d138975d4e43242409a5 /helpcontent2/makefile.pmk | |
| parent | 9bc3eec1ec6fb2b53715abacb9f5ace5330c6a9d (diff) | |
INTEGRATION: CWS ause069 (1.17.10); FILE MERGED
2006/12/04 22:03:46 hjs 1.17.10.2: RESYNC: (1.17-1.18); FILE MERGED
2006/10/18 17:11:01 hjs 1.17.10.1: #i70359# remove forced shell calls
Diffstat (limited to 'helpcontent2/makefile.pmk')
| -rwxr-xr-x | helpcontent2/makefile.pmk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/helpcontent2/makefile.pmk b/helpcontent2/makefile.pmk index ec76d0c304..e650aed154 100755 --- a/helpcontent2/makefile.pmk +++ b/helpcontent2/makefile.pmk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.pmk,v $ # -# $Revision: 1.18 $ +# $Revision: 1.19 $ # -# last change: $Author: kz $ $Date: 2006-11-08 11:53:34 $ +# last change: $Author: obo $ $Date: 2007-01-25 15:32:01 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -50,23 +50,23 @@ $(COMMONMISC)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp $(COMMONMISC)$/$(TARGET).done : $(HLANGXHPFILES) .IF "$(WITH_LANG)"!="" - @+$(WRAPCMD) helpex -QQ -p helpcontent2 -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m localize.sdf && $(TOUCH) $@ + @$(WRAPCMD) helpex -QQ -p helpcontent2 -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m localize.sdf && $(TOUCH) $@ .ELSE # "$(WITH_LANG)"!="" .IF "$(USE_SHELL)"=="4nt" # it's getting real ugly... - +(cmd /c $(TYPE) $(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) | xargs --verbose --max-args=15 cp -t $(COMMONMISC)$/en-US$/$(SHELL_PACKAGE)) && $(TOUCH) $@ + (cmd /c $(TYPE) $(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) | xargs --verbose --max-args=15 cp -t $(COMMONMISC)$/en-US$/$(SHELL_PACKAGE)) && $(TOUCH) $@ .ELSE # "$(USE_SHELL)"=="4nt" cp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES)))) $(COMMONMISC)$/en-US$/$(SHELL_PACKAGE) && $(TOUCH) $@ .ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(WITH_LANG)"!="" .IF "$(OS)"=="SOLARIS" - @+$(ECHONL) " " + @$(ECHONL) " " .ELSE # "$(OS)"=="SOLARIS" - @+$(ECHONL) + @$(ECHONL) .ENDIF # "$(OS)"=="SOLARIS" $(COMMONMISC)$/xhp_changed.flag : $(HLANGXHPFILES) - @+$(TOUCH) $@ + @$(TOUCH) $@ # urks - dmake mixes up operators and strings :-( .IF "$(HLANGXHPFILES:s/defined/xxx/)"!="" @@ -86,7 +86,7 @@ optix: $(COMMONMISC)$/$(TARGET).done @echo done %.created : - @+-$(MKDIRHIER) $(@:d) >& $(NULLDEV) + @-$(MKDIRHIER) $(@:d) >& $(NULLDEV) @$(TOUCH) $@ |