INTEGRATION: CWS sw30bf12_DEV300 (1.4.8); FILE MERGED

2008/08/07 17:04:28 mba 1.4.8.1: prevent adding of licence files in 73 languages

3 files changed, 14 insertions, 17 deletions

diff --git a/dictionaries/lt_LT/makefile.mk b/dictionaries/lt_LT/makefile.mk
index 362a70e..717db69 100644
--- a/dictionaries/lt_LT/makefile.mk
+++ b/dictionaries/lt_LT/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.4 $
+# $Revision: 1.5 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -57,7 +57,6 @@ COMPONENT_FILES= \
     $(EXTENSIONDIR)$/lt_LT.dic \
     $(EXTENSIONDIR)$/hyph_lt_LT.dic \
     $(EXTENSIONDIR)$/README_lt_LT.txt \
-    $(EXTENSIONDIR)$/COPYING_lt_LT \
     $(EXTENSIONDIR)$/README_hyph_lt_LT.txt
 
 COMPONENT_CONFIGDEST=.
@@ -65,14 +64,14 @@ COMPONENT_XCU= \
     $(EXTENSIONDIR)$/dictionaries.xcu
 
 # disable fetching default OOo license text
-# CUSTOM_LICENSE=README_da_DK.txt
+CUSTOM_LICENSE=COPYING_lt_LT
 # override default license destination
-# PACKLICS= $(EXTENSIONDIR)$/registration$/$(CUSTOM_LICENSE)
+PACKLICS= $(EXTENSIONDIR)$/$(CUSTOM_LICENSE)
 
 # add own targets to packing dependencies (need to be done before
 # packing the xtension
 # EXTENSION_PACKDEPS=makefile.mk $(CUSTOM_LICENSE)
-EXTENSION_PACKDEPS=$(COMPONENT_UNZIP_FILES)
+EXTENSION_PACKDEPS=$(COMPONENT_FILES)
 
 # global settings for extension packing
 .INCLUDE : extension_pre.mk
diff --git a/dictionaries/ne_NP/makefile.mk b/dictionaries/ne_NP/makefile.mk
index 3695509..60f0ae5 100644
--- a/dictionaries/ne_NP/makefile.mk
+++ b/dictionaries/ne_NP/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.4 $
+# $Revision: 1.5 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -55,7 +55,6 @@ EXTENSION_ZIPNAME:=dict-ne
 COMPONENT_FILES= \
     $(EXTENSIONDIR)$/ne_NP.aff \
     $(EXTENSIONDIR)$/ne_NP.dic \
-    $(EXTENSIONDIR)$/README_ne_NP.txt \
     $(EXTENSIONDIR)$/README_th_ne_NP_v2.txt
 
 COMPONENT_CONFIGDEST=.
@@ -63,13 +62,13 @@ COMPONENT_XCU= \
     $(EXTENSIONDIR)$/dictionaries.xcu
 
 # disable fetching default OOo license text
-# CUSTOM_LICENSE=WordNet_license.txt
+CUSTOM_LICENSE=README_ne_NP.txt
 # override default license destination
-# PACKLICS= $(EXTENSIONDIR)$/registration$/$(CUSTOM_LICENSE)
+PACKLICS= $(EXTENSIONDIR)$/$(CUSTOM_LICENSE)
 
 COMPONENT_ZIP:=$(PWD)$/th_ne_NP_v2.zip
 COMPONENT_UNZIP_FILES= \
-    $(EXTENSIONDIR)$/th_ne_NP_v2.dat 
+    $(EXTENSIONDIR)$/th_ne_NP_v2.dat
 
 # add own targets to packing dependencies (need to be done before
 # packing the xtension
@@ -88,4 +87,4 @@ $(COMPONENT_UNZIP_FILES) : "$(COMPONENT_ZIP)"
 .ENDIF			# "$(COMPONENT_UNZIP_FILES)"!=""
 
 $(EXTENSIONDIR)$/th_ne_NP_v2.idx : "$(EXTENSIONDIR)$/th_ne_NP_v2.dat"
-        $(PERL) $(PRJ)$/util$/th_gen_idx.pl -o $(EXTENSIONDIR)$/th_ne_NP_v2.idx <$(EXTENSIONDIR)$/th_ne_NP_v2.dat
\ No newline at end of file
+        $(PERL) $(PRJ)$/util$/th_gen_idx.pl -o $(EXTENSIONDIR)$/th_ne_NP_v2.idx <$(EXTENSIONDIR)$/th_ne_NP_v2.dat
diff --git a/dictionaries/nl_NL/makefile.mk b/dictionaries/nl_NL/makefile.mk
index 1952bf6..53ef764 100644
--- a/dictionaries/nl_NL/makefile.mk
+++ b/dictionaries/nl_NL/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.4 $
+# $Revision: 1.5 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -55,22 +55,21 @@ EXTENSION_ZIPNAME:=dict-nl
 COMPONENT_FILES= \
     $(EXTENSIONDIR)$/nl_NL.aff \
     $(EXTENSIONDIR)$/nl_NL.dic \
-    $(EXTENSIONDIR)$/hyph_nl_NL.dic \
-    $(EXTENSIONDIR)$/README_nl_NL.txt
+    $(EXTENSIONDIR)$/hyph_nl_NL.dic
 
 COMPONENT_CONFIGDEST=.
 COMPONENT_XCU= \
     $(EXTENSIONDIR)$/dictionaries.xcu
 
 # disable fetching default OOo license text
-# CUSTOM_LICENSE=README_da_DK.txt
+CUSTOM_LICENSE=README_nl_NL.txt
 # override default license destination
-# PACKLICS= $(EXTENSIONDIR)$/registration$/$(CUSTOM_LICENSE)
+PACKLICS= $(EXTENSIONDIR)$/$(CUSTOM_LICENSE)
 
 # add own targets to packing dependencies (need to be done before
 # packing the xtension
 # EXTENSION_PACKDEPS=makefile.mk $(CUSTOM_LICENSE)
-EXTENSION_PACKDEPS=$(COMPONENT_UNZIP_FILES)
+EXTENSION_PACKDEPS=$(COMPONENT_FILES)
 
 # global settings for extension packing
 .INCLUDE : extension_pre.mk