[Libreoffice-commits] core.git: postprocess/CustomTarget_registry.mk

Bjoern Michaelsen bjoern.michaelsen at canonical.com
Wed Oct 30 20:19:58 CET 2013


 postprocess/CustomTarget_registry.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2c3d648117835df405ff8414c51821d2a0ed1519
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Oct 30 02:56:28 2013 +0100

    make postprocess handle commas in OOO_VENDOR correctly
    
    Change-Id: I560d561ba10cdaa113a154ce9bed27de65d6d8eb

diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 8040051..b78ff02 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -554,7 +554,7 @@ postprocess_main_SED := \
 	-e 's,$${ABOUTBOXPRODUCTVERSION},$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX),g' \
 	-e 's,$${ABOUTBOXPRODUCTVERSIONSUFFIX},$(LIBO_VERSION_SUFFIX_SUFFIX),g' \
 	-e 's,$${DICT_REPO_URL},http://extensions.libreoffice.org/dictionaries/,g' \
-	-e 's,$${OOOVENDOR},$(if $(OOO_VENDOR),$(OOO_VENDOR),The Document Foundation),g' \
+	-e 's,$${OOOVENDOR},$(if $(OOO_VENDOR),$(subst $(COMMA),\x2c,$(OOO_VENDOR)),The Document Foundation),g' \
 	-e 's,$${PRODUCTNAME},$(PRODUCTNAME),g' \
 	-e 's,$${PRODUCTVERSION},$(PRODUCTVERSION),g' \
 	-e 's,$${PRODUCTEXTENSION},.$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX),g' \


More information about the Libreoffice-commits mailing list