diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-04-11 08:30:00 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-04-11 08:30:00 +0000 |
| commit | 3ecbbb9edbeb1ef45e1ff45e1ff2df69a708c0d8 (patch) | |
| tree | 5d8df84ff765ec4f235615762660ed2433fe4e09 /helpcontent2/util/target.pmk | |
| parent | ec48fbe3119ffdeaef0bdce72ffb239c17dfc9f1 (diff) | |
INTEGRATION: CWS systemdb (1.8.18); FILE MERGED
2005/03/31 08:28:24 rene 1.8.18.1: fix build with system db, remove system-db3 flags, add system-db
#i34430# copy db.jar into the tree
Diffstat (limited to 'helpcontent2/util/target.pmk')
| -rwxr-xr-x | helpcontent2/util/target.pmk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/helpcontent2/util/target.pmk b/helpcontent2/util/target.pmk index d3852ba565..7ae1cc8d33 100755 --- a/helpcontent2/util/target.pmk +++ b/helpcontent2/util/target.pmk @@ -2,9 +2,9 @@ # # $RCSfile: target.pmk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: hr $ $Date: 2005-02-11 18:24:05 $ +# last change: $Author: hr $ $Date: 2005-04-11 09:30:00 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -67,7 +67,11 @@ LINKALLADDEDDEPS=$(foreach,i,$(aux_alllangiso) $(subst,LANGUAGE,$i $(LINKADDEDDP ALLTAR : $(LINKALLTARGETS) .ENDIF +.IF "$(SYSTEM_DB)" != "YES" +JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN) +.ENDIF + $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(MISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(MISC)$/xhp_changed.flag @+-$(MKDIR) -p $(@:d) - $(JAVAI) -Djava.library.path=$(SOLARSHAREDBIN) -cp $(my_cp) com.sun.star.help.HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(MISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(MISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@) + $(JAVAI) $(JAVA_LIBRARY_PATH) -cp $(my_cp) com.sun.star.help.HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(MISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(MISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@) |