summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-08-01 11:11:20 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-08-01 11:11:20 +0000
commit6536795ee0b0c6b79070cba8110efa44d8494548 (patch)
tree8a40307781101c4c66aab297739598b463c7f0b3
parent3e70609c60cee26aa4a07f68d90f7246b44d9656 (diff)
INTEGRATION: CWS helpsearch (1.25.2); FILE MERGED
2008/07/23 07:23:19 jsc 1.25.2.1: #i91750# add lang parameter for HelpIndexer
-rwxr-xr-xhelpcontent2/util/target.pmk4
1 files changed, 2 insertions, 2 deletions
diff --git a/helpcontent2/util/target.pmk b/helpcontent2/util/target.pmk
index 005b44550..b7fd7da2b 100755
--- a/helpcontent2/util/target.pmk
+++ b/helpcontent2/util/target.pmk
@@ -8,7 +8,7 @@
#
# $RCSfile: target.pmk,v $
#
-# $Revision: 1.25 $
+# $Revision: 1.26 $
#
# This file is part of OpenOffice.org.
#
@@ -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
$(WRAPCMD) 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.HelpIndexer -mod $(LINKNAME) -zipdir $(MISC)$/ziptmp$(@:b) -o $@
+ $(JAVAI) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexer -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(MISC)$/ziptmp$(@:b) -o $@
.ELSE
-$(RM) $(MISC)$/ziptmp$(@:b)$/content/*.*
-$(RM) $(MISC)$/ziptmp$(@:b)$/caption/*.*