diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-11-08 10:53:34 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-11-08 10:53:34 +0000 |
| commit | 9a759b6a398af193a9608f8cb44e3638846361d2 (patch) | |
| tree | 9fa4d1f801e0d4414149ae8a098cc645a8eb0814 /helpcontent2/makefile.pmk | |
| parent | b765e2dd1bba264c1f27ca0c032c00c1d4280ac0 (diff) | |
INTEGRATION: CWS ause070 (1.17.6); FILE MERGED
2006/10/19 16:39:04 hjs 1.17.6.4: #i70163# ugly 4nt hack
2006/10/18 16:27:04 hjs 1.17.6.3: #i70136# change check to work with configure default
2006/10/13 11:11:31 hjs 1.17.6.2: #i70136# second try
2006/10/11 14:05:47 hjs 1.17.6.1: #i70136# just copy unmerged source .xhp for en-US only
Diffstat (limited to 'helpcontent2/makefile.pmk')
| -rwxr-xr-x | helpcontent2/makefile.pmk | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/helpcontent2/makefile.pmk b/helpcontent2/makefile.pmk index 6dc7e95e4a..ec76d0c304 100755 --- a/helpcontent2/makefile.pmk +++ b/helpcontent2/makefile.pmk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.pmk,v $ # -# $Revision: 1.17 $ +# $Revision: 1.18 $ # -# last change: $Author: kz $ $Date: 2006-10-05 10:50:10 $ +# last change: $Author: kz $ $Date: 2006-11-08 11:53:34 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -47,8 +47,18 @@ $(COMMONMISC)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp # internal dependencies not sufficient to trigger merge? # @$(NULL) + $(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) $@ +.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) $@ +.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) " " .ELSE # "$(OS)"=="SOLARIS" @@ -65,7 +75,10 @@ $(COMMONMISC)$/xhp_changed.flag : $(HLANGXHPFILES) $(COMMONMISC)$/$(TARGET).done .PHONY : .ELSE # "$(HELPTRANSPHONY)"!="" -$(COMMONMISC)$/$(TARGET).done : localize.sdf makefile.mk +$(COMMONMISC)$/$(TARGET).done : makefile.mk +.IF "$(WITH_LANG)"!="" +$(COMMONMISC)$/$(TARGET).done : localize.sdf +.ENDIF # "$(WITH_LANG)"!="" .ENDIF # "$(HELPTRANSPHONY)"!="" .ENDIF # "$(HLANGXHPFILES)"!="" |