diff options
| author | Thomas Lange [tl] <tl@openoffice.org> | 2010-06-18 13:09:52 +0200 |
|---|---|---|
| committer | Thomas Lange [tl] <tl@openoffice.org> | 2010-06-18 13:09:52 +0200 |
| commit | 41a71626c7d8046b63ec67d430b99aaba35fc80e (patch) | |
| tree | f7870f4f06dd3fd53b7ac82519dafaa8b49bfe86 /helpcontent2/util | |
| parent | dd0b89d28397f8b16f7da9f4128cd98ae6e5195c (diff) | |
| parent | c15c65cbc8a35583026d7f5ef21973040825ad62 (diff) | |
cws tl79: merge with DEV300_m83
Diffstat (limited to 'helpcontent2/util')
| -rw-r--r-- | helpcontent2/util/target.pmk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/helpcontent2/util/target.pmk b/helpcontent2/util/target.pmk index c5649de4dc..44b73709b4 100644 --- a/helpcontent2/util/target.pmk +++ b/helpcontent2/util/target.pmk @@ -37,7 +37,11 @@ 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 $@.$(INPATH)) .IF "$(SOLAR_JAVA)" == "TRUE" +.IF "$(CHECK_LUCENCE_INDEXER_OUTPUT)" == "" + $(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 $@.$(INPATH) +.ELSE $(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 $@.$(INPATH) -checkcfsandsegname _0 _3 +.ENDIF $(RENAME) $@.$(INPATH) $@ .ELSE -$(RM) $(MISC)$/ziptmp$(@:b)$/content/*.* |