Kaydet (Commit) 1b5bcb65 authored tarafından Thorsten Behrens's avatar Thorsten Behrens

Make extension cross-buildable again.

üst 07a7e3a7
...@@ -74,6 +74,6 @@ $(HELPLINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(XHPLINKSRC)/$$(@:b:s/_/./ ...@@ -74,6 +74,6 @@ $(HELPLINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(XHPLINKSRC)/$$(@:b:s/_/./
$(COMMAND_ECHO)$(JAVAI) $(JAVAIFLAGS) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexerTool -extension -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))} -checkcfsandsegname _0 _3 && $(TOUCH) $@ $(COMMAND_ECHO)$(JAVAI) $(JAVAIFLAGS) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexerTool -extension -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))} -checkcfsandsegname _0 _3 && $(TOUCH) $@
.ENDIF .ENDIF
.ELSE .ELSE
-$(RM) $(XHPLINKSRC)/$(@:b)/content/*.* -$(RM) $(XHPLINKSRC)/$(@:b:s/_/./:e:s/.//)/content/*.*
-$(RM) $(XHPLINKSRC)/$(@:b)/caption/*.* -$(RM) $(XHPLINKSRC)/$(@:b:s/_/./:e:s/.//)/caption/*.*
.ENDIF .ENDIF
...@@ -161,7 +161,7 @@ $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC) ...@@ -161,7 +161,7 @@ $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC)
.IF "$(GUI)" == "WNT" .IF "$(GUI)" == "WNT"
PACKLICDEPS=$(SOLARVER)/$(INPATH)/bin/osl/license.txt PACKLICDEPS=$(SOLARVER)/$(INPATH)/bin/osl/license.txt
.ELSE # "$(GUI)" == "WNT" .ELSE # "$(GUI)" == "WNT"
PACKLICDEPS=$(SOLARBINDIR)/osl/LICENSE PACKLICDEPS=$(SOLARVER)/$(INPATH)/bin/osl/LICENSE
.ENDIF # "$(GUI)" == "WNT" .ENDIF # "$(GUI)" == "WNT"
.ELSE # "$(CUSTOM_LICENSE)" == "" .ELSE # "$(CUSTOM_LICENSE)" == ""
PACKLICDEPS=$(CUSTOM_LICENSE) PACKLICDEPS=$(CUSTOM_LICENSE)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment