solenv/inc/extension_helplink.mk | 4 ++-- solenv/inc/extension_post.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 1b5bcb6562abc4fe684fe4e046bde93df1af3d12 Author: Thorsten Behrens <tbehr...@novell.com> Date: Tue Sep 27 12:16:55 2011 +0200 Make extension cross-buildable again. diff --git a/solenv/inc/extension_helplink.mk b/solenv/inc/extension_helplink.mk index c9fa15e..df61f42 100644 --- a/solenv/inc/extension_helplink.mk +++ b/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 diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk index 82421e2..ca65e5a 100644 --- a/solenv/inc/extension_post.mk +++ b/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) _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits