Make extension cross-buildable again.

solenv/inc/extension_helplink.mk

@@ -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) $@
 .ENDIF
 .ELSE
-    -$(RM) $(XHPLINKSRC)/$(@:b)/content/*.*
-    -$(RM) $(XHPLINKSRC)/$(@:b)/caption/*.*
+    -$(RM) $(XHPLINKSRC)/$(@:b:s/_/./:e:s/.//)/content/*.*
+    -$(RM) $(XHPLINKSRC)/$(@:b:s/_/./:e:s/.//)/caption/*.*
 .ENDIF

solenv/inc/extension_post.mk

@@ -161,7 +161,7 @@ $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC)
 .IF "$(GUI)" == "WNT"
 PACKLICDEPS=$(SOLARVER)/$(INPATH)/bin/osl/license.txt
 .ELSE			# "$(GUI)" == "WNT"
-PACKLICDEPS=$(SOLARBINDIR)/osl/LICENSE
+PACKLICDEPS=$(SOLARVER)/$(INPATH)/bin/osl/LICENSE
 .ENDIF			# "$(GUI)" == "WNT"
 .ELSE			# "$(CUSTOM_LICENSE)" == ""
 PACKLICDEPS=$(CUSTOM_LICENSE)