diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-28 11:00:35 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-28 11:00:35 +0000 |
| commit | 1be3bdd5d7ec682c5555af65a8e23cd57168d219 (patch) | |
| tree | acfe07a43f3d1291e642c69cb48c3c9708528672 /helpcontent2/makefile.pmk | |
| parent | fbc8975389b56451d68d5dfd1d5c5f2a7cce4db2 (diff) | |
INTEGRATION: CWS ause037 (1.9.64); FILE MERGED
2005/09/06 15:30:38 hjs 1.9.64.1: #125412# allow building to shared output tree
Diffstat (limited to 'helpcontent2/makefile.pmk')
| -rwxr-xr-x | helpcontent2/makefile.pmk | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/helpcontent2/makefile.pmk b/helpcontent2/makefile.pmk index 7132034fa8..a721ccf5f9 100755 --- a/helpcontent2/makefile.pmk +++ b/helpcontent2/makefile.pmk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.pmk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: rt $ $Date: 2005-09-07 15:26:04 $ +# last change: $Author: hr $ $Date: 2005-09-28 12:00:35 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -34,31 +34,31 @@ #************************************************************************* SHELL_PACKAGE:=$(subst,/,$/ $(PACKAGE)) -HLANGXHPFILES:=$(foreach,i,$(XHPFILES) $(foreach,j,$(aux_alllangiso) $(MISC)$/$j$/$(SHELL_PACKAGE)$/$(i:f))) +HLANGXHPFILES:=$(foreach,i,$(XHPFILES) $(foreach,j,$(aux_alllangiso) $(COMMONMISC)$/$j$/$(SHELL_PACKAGE)$/$(i:f))) .IF "$(SOLAR_JAVA)"!="" -ALLTAR : $(foreach,i,$(XHPFILES:b) $(MISC)$/$(TARGET).$i.done) $(MISC)$/xhp_changed.flag optix +ALLTAR : $(foreach,i,$(XHPFILES:b) $(COMMONMISC)$/$(TARGET).$i.done) $(COMMONMISC)$/xhp_changed.flag optix .ENDIF $(HLANGXHPFILES) : $$(@:d)thisdir.created -$(MISC)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp : %.xhp +$(COMMONMISC)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp : %.xhp @$(TOUCH) $@ -$(foreach,i,$(XHPFILES:b) $(MISC)$/$(TARGET).$i.done) : $(MISC)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/$$(@:b:e:s/.//).xhp - @+$(WRAPCMD) helpex -QQ -p help2 -r $(PRJ) -i $(uniq $(<:f)) -x $(MISC) -y $(SHELL_PACKAGE)$/$(@:b:e:s/.//).xhp -l all -lf $(aux_alllangiso:t",") -m localize.sdf && $(TOUCH) $@ +$(foreach,i,$(XHPFILES:b) $(COMMONMISC)$/$(TARGET).$i.done) : $(COMMONMISC)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/$$(@:b:e:s/.//).xhp + @+$(WRAPCMD) helpex -QQ -p help2 -r $(PRJ) -i $(uniq $(<:f)) -x $(COMMONMISC) -y $(SHELL_PACKAGE)$/$(@:b:e:s/.//).xhp -l all -lf $(aux_alllangiso:t",") -m localize.sdf && $(TOUCH) $@ # urks - dmake mixes up operators and strings :-( .IF "$(HLANGXHPFILES:s/defined/xxx/)"!="" .IF "$(HELPTRANSPHONY)"!="" -$(foreach,i,$(XHPFILES) $(MISC)$/$(TARGET).$(i:b).done) .PHONY : +$(foreach,i,$(XHPFILES) $(COMMONMISC)$/$(TARGET).$(i:b).done) .PHONY : .ELSE # "$(HELPTRANSPHONY)"!="" -$(foreach,i,$(XHPFILES) $(MISC)$/$(TARGET).$(i:b).done) : localize.sdf makefile.mk +$(foreach,i,$(XHPFILES) $(COMMONMISC)$/$(TARGET).$(i:b).done) : localize.sdf makefile.mk .ENDIF # "$(HELPTRANSPHONY)"!="" .ENDIF # "$(HLANGXHPFILES)"!="" -$(MISC)$/xhp_changed.flag : $(HLANGXHPFILES) +$(COMMONMISC)$/xhp_changed.flag : $(HLANGXHPFILES) @+$(TOUCH) $@ # it's hard to get just a newline... .IF "$(OS)"=="SOLARIS" @@ -67,7 +67,7 @@ $(MISC)$/xhp_changed.flag : $(HLANGXHPFILES) @+$(ECHONL) .ENDIF # "$(OS)"=="SOLARIS" -optix: $(foreach,i,$(XHPFILES) $(MISC)$/$(TARGET).$(i:b).done) +optix: $(foreach,i,$(XHPFILES) $(COMMONMISC)$/$(TARGET).$(i:b).done) @+echo done %.created : |