diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-07 15:03:10 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-07 15:03:10 +0000 |
| commit | 6d24cd9b7e8a20fb50a45b3c0013ac83b43b1260 (patch) | |
| tree | fae6b7b5495cd4014dfdbee9d84e06ab5b9e7572 | |
| parent | e6a57d2bebd93588425b9692f7ee8a5f70aeba45 (diff) | |
INTEGRATION: CWS ab55 (1.23.2); FILE MERGED
2008/07/03 14:18:22 ab 1.23.2.1: #i91232# zip manually if no java
| -rwxr-xr-x | helpcontent2/util/target.pmk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/helpcontent2/util/target.pmk b/helpcontent2/util/target.pmk index 8b7e442b22..005b445503 100755 --- a/helpcontent2/util/target.pmk +++ b/helpcontent2/util/target.pmk @@ -8,7 +8,7 @@ # # $RCSfile: target.pmk,v $ # -# $Revision: 1.24 $ +# $Revision: 1.25 $ # # This file is part of OpenOffice.org. # @@ -40,4 +40,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 $(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 $@) - $(JAVAI) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexer -foo -mod $(LINKNAME) -zipdir $(MISC)$/ziptmp$(@:b) -o $@ +.IF "$(SOLAR_JAVA)" == "TRUE" + $(JAVAI) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexer -mod $(LINKNAME) -zipdir $(MISC)$/ziptmp$(@:b) -o $@ +.ELSE + -$(RM) $(MISC)$/ziptmp$(@:b)$/content/*.* + -$(RM) $(MISC)$/ziptmp$(@:b)$/caption/*.* + zip -j -D $@ $(MISC)$/ziptmp$(@:b)$/* + -$(RM) $(MISC)$/ziptmp$(@:b)$/*.* +.ENDIF |