diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-10-11 12:44:04 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-10-11 12:44:04 +0000 |
| commit | b2a5ce8619bcd6ab22f27a8178873d616c4f8eb3 (patch) | |
| tree | ac9b8d470443f7552d74218d794931fc1e57cd5b /helpcontent2 | |
| parent | dd38273b8e880b5c2d871adb72b891d33747bd18 (diff) | |
INTEGRATION: CWS vq02 (1.1.4); FILE MERGED
2004/09/14 19:43:47 vq 1.1.4.1: #i34135# Patch for W32-tcsh build.
Diffstat (limited to 'helpcontent2')
| -rwxr-xr-x | helpcontent2/makefile.pmk | 6 | ||||
| -rwxr-xr-x | helpcontent2/settings.pmk | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/helpcontent2/makefile.pmk b/helpcontent2/makefile.pmk index 9ac788ac11..114a9445c3 100755 --- a/helpcontent2/makefile.pmk +++ b/helpcontent2/makefile.pmk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.pmk,v $ # -# $Revision: 1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: fpe $ $Date: 2004-08-18 10:52:38 $ +# last change: $Author: hr $ $Date: 2004-10-11 13:43:46 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -82,7 +82,7 @@ HELPTRANSPHONY:=.PHONY $(MISC)$/%.hzip : $(MISC)$/%.xhp @+-$(MKDIR) -p $(@:d) - java -cp $(my_cp) com.sun.star.help.HelpCompiler -c $< -o $@ -src "$(PRJ)$/source" -sty "$(PRJ)$/source$/auxiliary$/embed.xsl" -idx "$(PRJ)$/source$/auxiliary$/index.xsl" -mod $(MODULE) -lang {$(subst,$/, $(subst,text$/, $(subst,$(MODULE)$/, $(subst,$(MISC), $(@:d:d:d)))))} > $(@:d:d)$/$(@:b).dphh_ + $(WRAPCMD) java -cp $(my_cp) com.sun.star.help.HelpCompiler -c $< -o $@ -src "$(PRJ)$/source" -sty "$(PRJ)$/source$/auxiliary$/embed.xsl" -idx "$(PRJ)$/source$/auxiliary$/index.xsl" -mod $(MODULE) -lang {$(subst,$/, $(subst,text$/, $(subst,$(MODULE)$/, $(subst,$(MISC), $(@:d:d:d)))))} > $(@:d:d)$/$(@:b).dphh_ $(MISC)$/%.dphh : $(MISC)$/%.dphh_ @+$(RENAME) {$@}_ $@ diff --git a/helpcontent2/settings.pmk b/helpcontent2/settings.pmk index f9dd4b0c23..13e4c2e03d 100755 --- a/helpcontent2/settings.pmk +++ b/helpcontent2/settings.pmk @@ -1,7 +1,3 @@ -.IF "$(USE_SHELL)"!="4nt" -my_cp=$(CLASSPATH):$(SOLARBINDIR)$/jaxp.jar:$(SOLARBINDIR)$/parser.jar:$(SOLARBINDIR)$/xt.jar:$(SOLARBINDIR)$/unoil.jar:$(SOLARBINDIR)$/ridl.jar:$(SOLARBINDIR)$/jurt.jar:$(SOLARBINDIR)$/jut.jar:$(SOLARBINDIR)$/xmlsearch.jar:$(SOLARBINDIR)$/db.jar:$(SOLARBINDIR)$/xmlsearch.jar:$(SOLARBINDIR)$/xmlhelp.jar -.ELSE # "$(USE_SHELL)"!="4nt" -my_cp=$(CLASSPATH);$(SOLARBINDIR)$/jaxp.jar;$(SOLARBINDIR)$/parser.jar;$(SOLARBINDIR)$/xt.jar;$(SOLARBINDIR)$/unoil.jar;$(SOLARBINDIR)$/ridl.jar;$(SOLARBINDIR)$/jurt.jar;$(SOLARBINDIR)$/jut.jar;$(SOLARBINDIR)$/xmlsearch.jar;$(SOLARBINDIR)$/db.jar;$(SOLARBINDIR)$/xmlsearch.jar;$(SOLARBINDIR)$/xmlhelp.jar -.ENDIF # "$(USE_SHELL)"!="4nt" +my_cp=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/db.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlhelp.jar |