diff options
| author | Thorsten Behrens <tbehrens@novell.com> | 2011-09-27 12:16:55 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2011-09-27 12:17:50 +0200 |
| commit | 1b5bcb6562abc4fe684fe4e046bde93df1af3d12 (patch) | |
| tree | 703dd82c892a8eb6f76230384e288e6835693914 | |
| parent | 07a7e3a76a2b64735f5c96a399d1da78a6209dd8 (diff) | |
Make extension cross-buildable again.
| -rw-r--r-- | solenv/inc/extension_helplink.mk | 4 | ||||
| -rw-r--r-- | solenv/inc/extension_post.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/solenv/inc/extension_helplink.mk b/solenv/inc/extension_helplink.mk index c9fa15e6770b..df61f421ce6f 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 82421e24011b..ca65e5ae23fe 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) |