fixup extensions' LICENSE file re-use rules

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)

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!