[Libreoffice-commits] .: solenv/inc

[Michael Meeks]

 solenv/inc/extension_post.mk |    4 ++--
 solenv/inc/extension_pre.mk  |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit eaffc7123a93dc0efd2c7ef84a5409940095d10c
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Wed Dec 8 20:09:08 2010 +0000

    fixup extensions' LICENSE file re-use rules

diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk
index f221ff7..868ef4b 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 abef2e7..7fd8f5d 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!