diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-01-07 20:43:47 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-01-10 09:49:49 +0000 |
| commit | 0a4365afa3300b8aa9b9063daf6aacce1ba17422 (patch) | |
| tree | 311ee347c5020df49968ac1ff3bc847d436aeb8a | |
| parent | 38f7677546402e4b65aab3c08ac16a8a1c31447a (diff) | |
Resolves: fdo#32897 strip out template language tags
9 files changed, 10 insertions, 9 deletions
diff --git a/extras/source/premium/templates-nonfree/layout/lang/makefile.mk b/extras/source/premium/templates-nonfree/layout/lang/makefile.mk index e44e0943..9c0da601 100644 --- a/extras/source/premium/templates-nonfree/layout/lang/makefile.mk +++ b/extras/source/premium/templates-nonfree/layout/lang/makefile.mk @@ -40,7 +40,7 @@ TARGET=premiumtemplatesnonfreelayout ZIP1TARGET = $(PREMIUM_TEMPLATES_NONFREE_LAYOUT_IMPRESS_TARGET) - +ZIP1STRIPLANGUAGETAGS=1 ZIP1LIST = $(LANGDIR)$/* diff --git a/extras/source/premium/templates-nonfree/presnt/lang/makefile.mk b/extras/source/premium/templates-nonfree/presnt/lang/makefile.mk index 7ffde4ce..239d2daf 100644 --- a/extras/source/premium/templates-nonfree/presnt/lang/makefile.mk +++ b/extras/source/premium/templates-nonfree/presnt/lang/makefile.mk @@ -40,7 +40,7 @@ TARGET=premiumtemplatesnonfreepresnt ZIP1TARGET = $(PREMIUM_TEMPLATES_NONFREE_PRESNT_IMPRESS_TARGET) - +ZIP1STRIPLANGUAGETAGS=1 ZIP1LIST = $(LANGDIR)$/* diff --git a/extras/source/premium/templates/common/layout/makefile.mk b/extras/source/premium/templates/common/layout/makefile.mk index c78dab55..470210ac 100644 --- a/extras/source/premium/templates/common/layout/makefile.mk +++ b/extras/source/premium/templates/common/layout/makefile.mk @@ -40,7 +40,7 @@ TARGET=premiumtemplatescommonlayout ZIP1TARGET = $(PREMIUM_TEMPLATES_COMMON_LAYOUT_IMPRESS_TARGET) - +ZIP1STRIPLANGUAGETAGS=1 ZIP1LIST = * -x makefile.* diff --git a/extras/source/premium/templates/common/presnt/makefile.mk b/extras/source/premium/templates/common/presnt/makefile.mk index 2d5ea56b..d27aa0d1 100644 --- a/extras/source/premium/templates/common/presnt/makefile.mk +++ b/extras/source/premium/templates/common/presnt/makefile.mk @@ -40,7 +40,7 @@ TARGET=premiumtemplatescommonpresnt ZIP1TARGET = $(PREMIUM_TEMPLATES_COMMON_PRESNT_IMPRESS_TARGET) - +ZIP1STRIPLANGUAGETAGS=1 ZIP1LIST = * -x makefile.* diff --git a/extras/source/premium/templates/layout/lang/makefile.mk b/extras/source/premium/templates/layout/lang/makefile.mk index 31c277b2..b664c121 100644 --- a/extras/source/premium/templates/layout/lang/makefile.mk +++ b/extras/source/premium/templates/layout/lang/makefile.mk @@ -40,7 +40,7 @@ TARGET=premiumtemplateslayout ZIP1TARGET = $(PREMIUM_TEMPLATES_LAYOUT_IMPRESS_TARGET) - +ZIP1STRIPLANGUAGETAGS=1 ZIP1LIST = $(LANGDIR)$/* diff --git a/extras/source/premium/templates/presnt/lang/makefile.mk b/extras/source/premium/templates/presnt/lang/makefile.mk index 74eb7121..6f2e185f 100644 --- a/extras/source/premium/templates/presnt/lang/makefile.mk +++ b/extras/source/premium/templates/presnt/lang/makefile.mk @@ -40,7 +40,7 @@ TARGET=premiumtemplatespresnt ZIP1TARGET = $(PREMIUM_TEMPLATES_PRESNT_IMPRESS_TARGET) - +ZIP1STRIPLANGUAGETAGS=1 ZIP1LIST = $(LANGDIR)$/* diff --git a/extras/source/templates/lang/makefile.mk b/extras/source/templates/lang/makefile.mk index c0cc6e19..cfe7f544 100644 --- a/extras/source/templates/lang/makefile.mk +++ b/extras/source/templates/lang/makefile.mk @@ -38,7 +38,7 @@ TARGET=templatesgeneral ZIP1TARGET = $(TEMPLATE_ROOT_TARGET) - +ZIP1STRIPLANGUAGETAGS=1 ZIP1LIST = $(LANGDIR)$/* diff --git a/extras/source/templates/layout/makefile.mk b/extras/source/templates/layout/makefile.mk index 8fac9929..7b551705 100644 --- a/extras/source/templates/layout/makefile.mk +++ b/extras/source/templates/layout/makefile.mk @@ -36,7 +36,8 @@ TARGET=templateslayout .INCLUDE : $(PRJ)$/util$/target.pmk ZIP1TARGET = $(TEMPLATE_LAYOUT_IMPRESS_TARGET) -ZIP1LIST = * -x makefile -x delzip +ZIP1STRIPLANGUAGETAGS=1 +ZIP1LIST = * -x makefile.* -x delzip .INCLUDE : target.mk diff --git a/extras/source/templates/presnt/lang/makefile.mk b/extras/source/templates/presnt/lang/makefile.mk index fb89d31a..8fa2c5e2 100644 --- a/extras/source/templates/presnt/lang/makefile.mk +++ b/extras/source/templates/presnt/lang/makefile.mk @@ -38,7 +38,7 @@ TARGET=templatespresnt ZIP1TARGET = $(TEMPLATE_PRESNT_IMPRESS_TARGET) - +ZIP1STRIPLANGUAGETAGS=1 ZIP1LIST = $(LANGDIR)$/* |