diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 15:16:51 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 15:16:51 +0000 |
| commit | 6f29f404386e28e50dbfff0c112a86e42652c492 (patch) | |
| tree | 211548427407b9f0290e70cdf06ae5f2e6d64de3 /helpcontent2 | |
| parent | e8c241a41adf1134ef1b17b462cd27f35a3f4358 (diff) | |
INTEGRATION: CWS ab52 (1.21.14); FILE MERGED
2008/06/18 13:12:21 ab 1.21.14.2: #i83625# ziptmp -> $(MISC)
2008/06/18 11:33:28 ab 1.21.14.1: #i83625# Lucene indexing
Diffstat (limited to 'helpcontent2')
| -rwxr-xr-x | helpcontent2/util/target.pmk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/helpcontent2/util/target.pmk b/helpcontent2/util/target.pmk index 59d1202434..5f251f5f79 100755 --- a/helpcontent2/util/target.pmk +++ b/helpcontent2/util/target.pmk @@ -8,7 +8,7 @@ # # $RCSfile: target.pmk,v $ # -# $Revision: 1.21 $ +# $Revision: 1.22 $ # # This file is part of OpenOffice.org. # @@ -34,5 +34,10 @@ LINKALLADDEDDEPS=$(foreach,i,$(aux_alllangiso) $(subst,LANGUAGE,$i $(LINKADDEDDP ALLTAR : $(LINKALLTARGETS) +.IF "$(SYSTEM_DB)" != "YES" +JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN) +.ENDIF + $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag $(PRJ)$/helpers$/hid.lst - $(WRAPCMD) HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -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) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@) + $(WRAPCMD) HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -zipdir $(MISC)$/ziptmp -idxcaption $(PRJ)$/source$/auxiliary$/idxcaption.xsl -idxcontent $(PRJ)$/source$/auxiliary$/idxcontent.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@) + $(JAVAI) $(JAVA_LIBRARY_PATH) -cp $(my_cp) com.sun.star.help.HelpIndexer -foo -mod $(LINKNAME) -zipdir $(MISC)$/ziptmp -o $@ |