diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2010-12-08 20:09:08 +0000 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-12-13 20:16:28 +0100 |
| commit | e2d484687778989f6642e4f0054229b6574d37e6 (patch) | |
| tree | d7d53d30f19226ce60a5834696a79eb755245a56 /solenv | |
| parent | 0df9bf4c7ac96273d87b2965cd15d97650667cc1 (diff) | |
fixup extensions' LICENSE file re-use rules
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/extension_post.mk | 4 | ||||
| -rw-r--r-- | solenv/inc/extension_pre.mk | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk index f221ff7ebe4a..868ef4b104d4 100644 --- a/solenv/inc/extension_post.mk +++ b/solenv/inc/extension_post.mk @@ -149,9 +149,9 @@ $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC) # may not fit... .IF "$(CUSTOM_LICENSE)"=="" .IF "$(GUI)" == "WNT" -PACKLICDEPS=$(SOLARBINDIR)/osl/license$$(@:b:s/_/./:e:s/./_/)$$(@:e) +PACKLICDEPS=$(SOLARBINDIR)/osl/license.txt .ELSE # "$(GUI)" == "WNT" -PACKLICDEPS=$(SOLARBINDIR)/osl/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e) +PACKLICDEPS=$(SOLARBINDIR)/osl/LICENSE .ENDIF # "$(GUI)" == "WNT" .ELSE # "$(CUSTOM_LICENSE)" == "" PACKLICDEPS=$(CUSTOM_LICENSE) diff --git a/solenv/inc/extension_pre.mk b/solenv/inc/extension_pre.mk index abef2e7f8b73..7fd8f5d86c85 100644 --- a/solenv/inc/extension_pre.mk +++ b/solenv/inc/extension_pre.mk @@ -39,11 +39,11 @@ COMPONENT_MANIFEST*:=$(EXTENSIONDIR)/META-INF/manifest.xml MANIFEST_SRC*:=manifest.xml .IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT" -PACKLICS*:=$(foreach,i,$(alllangiso) $(EXTENSIONDIR)/registration/license_$i.txt) -COMPONENT_LIC_TEMPL*:=registration/license_xxx.txt +PACKLICS*:=$(EXTENSIONDIR)/registration/license.txt +COMPONENT_LIC_TEMPL*:=registration/license.txt .ELSE -PACKLICS*:=$(foreach,i,$(alllangiso) $(EXTENSIONDIR)/registration/LICENSE_$i) -COMPONENT_LIC_TEMPL*:=registration/LICENSE_xxx +PACKLICS*:=$(EXTENSIONDIR)/registration/LICENSE +COMPONENT_LIC_TEMPL*:=registration/LICENSE .ENDIF #TODO: check ZIP9TARGET for previous use! |