summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-08-14 13:28:35 +0000
committerKurt Zenker <kz@openoffice.org>2008-08-14 13:28:35 +0000
commit681de871bba437f3776e1f65d218b43b01c1291b (patch)
tree61a41931b841a4144bcf455c803613437ddd07ba
parentINTEGRATION: CWS sw30bf12_DEV300 (1.4.8); FILE MERGED (diff)
downloaddictionaries-681de871bba437f3776e1f65d218b43b01c1291b.tar.gz
dictionaries-681de871bba437f3776e1f65d218b43b01c1291b.zip
INTEGRATION: CWS sw30bf12_DEV300 (1.8.8); FILE MERGED
2008/08/07 17:04:29 mba 1.8.8.1: prevent adding of licence files in 73 languages
-rw-r--r--dictionaries/pl_PL/makefile.mk9
-rw-r--r--dictionaries/ru_RU/makefile.mk13
2 files changed, 10 insertions, 12 deletions
diff --git a/dictionaries/pl_PL/makefile.mk b/dictionaries/pl_PL/makefile.mk
index ee4a7d9..affdd41 100644
--- a/dictionaries/pl_PL/makefile.mk
+++ b/dictionaries/pl_PL/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.9 $
#
# This file is part of OpenOffice.org.
#
@@ -56,7 +56,6 @@ COMPONENT_FILES= \
$(EXTENSIONDIR)$/pl_PL.aff \
$(EXTENSIONDIR)$/pl_PL.dic \
$(EXTENSIONDIR)$/hyph_pl_PL.dic \
- $(EXTENSIONDIR)$/README_pl_PL.txt \
$(EXTENSIONDIR)$/README_hyph_pl_PL.txt
COMPONENT_CONFIGDEST=.
@@ -64,9 +63,9 @@ COMPONENT_XCU= \
$(EXTENSIONDIR)$/dictionaries.xcu
# disable fetching default OOo license text
-# CUSTOM_LICENSE=Copyright
+CUSTOM_LICENSE=README_pl_PL.txt
# override default license destination
-# PACKLICS= $(EXTENSIONDIR)$/registration$/$(CUSTOM_LICENSE)
+PACKLICS= $(EXTENSIONDIR)$/$(CUSTOM_LICENSE)
COMPONENT_ZIP:=$(PWD)$/th_pl_PL_v2.zip
COMPONENT_UNZIP_FILES= \
@@ -77,7 +76,7 @@ COMPONENT_UNZIP_FILES= \
# 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_UNZIP_FILES) $(COMPONENT_FILES)
# global settings for extension packing
.INCLUDE : extension_pre.mk
diff --git a/dictionaries/ru_RU/makefile.mk b/dictionaries/ru_RU/makefile.mk
index 74fb447..e311328 100644
--- a/dictionaries/ru_RU/makefile.mk
+++ b/dictionaries/ru_RU/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.9 $
#
# This file is part of OpenOffice.org.
#
@@ -53,21 +53,20 @@ EXTENSION_ZIPNAME:=dict-ru
# just copy:
COMPONENT_FILES= \
- $(EXTENSIONDIR)$/hyph_ru_RU.dic \
- $(EXTENSIONDIR)$/README_thes_ru_RU.txt
+ $(EXTENSIONDIR)$/hyph_ru_RU.dic
COMPONENT_CONFIGDEST=.
COMPONENT_XCU= \
$(EXTENSIONDIR)$/dictionaries.xcu
# disable fetching default OOo license text
-# CUSTOM_LICENSE=Copyright
+CUSTOM_LICENSE=README_thes_ru_RU.txt
# override default license destination
-# PACKLICS= $(EXTENSIONDIR)$/registration$/$(CUSTOM_LICENSE)
+PACKLICS= $(EXTENSIONDIR)$/$(CUSTOM_LICENSE)
COMPONENT_ZIP:=$(PWD)$/th_ru_RU_v2.zip
COMPONENT_UNZIP_FILES= \
- $(EXTENSIONDIR)$/th_ru_RU_v2.dat
+ $(EXTENSIONDIR)$/th_ru_RU_v2.dat
# add own targets to packing dependencies (need to be done before
# packing the xtension
@@ -86,4 +85,4 @@ $(COMPONENT_UNZIP_FILES) : "$(COMPONENT_ZIP)"
.ENDIF # "$(COMPONENT_UNZIP_FILES)"!=""
$(EXTENSIONDIR)$/th_ru_RU_v2.idx : "$(EXTENSIONDIR)$/th_ru_RU_v2.dat"
- $(PERL) $(PRJ)$/util$/th_gen_idx.pl -o $(EXTENSIONDIR)$/th_ru_RU_v2.idx <$(EXTENSIONDIR)$/th_ru_RU_v2.dat \ No newline at end of file
+ $(PERL) $(PRJ)$/util$/th_gen_idx.pl -o $(EXTENSIONDIR)$/th_ru_RU_v2.idx <$(EXTENSIONDIR)$/th_ru_RU_v2.dat