diff options
| author | sb <sb@openoffice.org> | 2010-02-12 21:44:58 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-02-12 21:44:58 +0100 |
| commit | 4d0cb1d88c3c6c8f325a50af97de6c5fbd32799c (patch) | |
| tree | 600cf0b88cecc14a9f721e6c0373f94280b6a728 | |
| parent | d2faa56bc245c92049b093f4b18d9264efaeed16 (diff) | |
sb118: introduced JAVAIFLAGS so that Java interpreter matches OOo jnilibs
| -rwxr-xr-x | helpcontent2/util/target.pmk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/helpcontent2/util/target.pmk b/helpcontent2/util/target.pmk index 58d9de8c79..e1a63ef6f9 100755 --- a/helpcontent2/util/target.pmk +++ b/helpcontent2/util/target.pmk @@ -41,7 +41,7 @@ JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN) $(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 $(HELPLINKER) @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers$/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -zipdir $(MISC)$/ziptmp$(@:b) -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 $@) .IF "$(SOLAR_JAVA)" == "TRUE" - $(JAVAI) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexerTool -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(MISC)$/ziptmp$(@:b) -o $@ -checkcfsname _0 + $(JAVAI) $(JAVAIFLAGS) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexerTool -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(MISC)$/ziptmp$(@:b) -o $@ -checkcfsname _0 .ELSE -$(RM) $(MISC)$/ziptmp$(@:b)$/content/*.* -$(RM) $(MISC)$/ziptmp$(@:b)$/caption/*.* |