[Libreoffice-commits] core.git: solenv/gbuild

Matúš Kukan matus.kukan at gmail.com
Thu Sep 12 03:53:41 PDT 2013


 solenv/gbuild/GeneratedPackage.mk |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 901afe3a5934229725a27f3c33b13d32c163c22a
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Thu Sep 12 12:34:57 2013 +0200

    use ';' instead of ':' to separate two parts of a string
    
    ':' is used in a path to files on Windows
    
    Change-Id: I3ca283a575bb753cbcd4dfd350947710efad3a62

diff --git a/solenv/gbuild/GeneratedPackage.mk b/solenv/gbuild/GeneratedPackage.mk
index 704a508..e3c54a9 100644
--- a/solenv/gbuild/GeneratedPackage.mk
+++ b/solenv/gbuild/GeneratedPackage.mk
@@ -19,8 +19,8 @@
 # If you know the filenames in advance, use Package. Laziness is not an
 # excuse.
 
-gb_GeneratedPackage__get_srcdir = $(lastword $(subst :, ,$(1)))
-gb_GeneratedPackage__get_destdir = $(firstword $(subst :, ,$(1)))
+gb_GeneratedPackage__get_srcdir = $(lastword $(subst ;, ,$(1)))
+gb_GeneratedPackage__get_destdir = $(firstword $(subst ;, ,$(1)))
 
 define gb_GeneratedPackage__command_cp
 mkdir -p $(dir $(2)) && \
@@ -111,7 +111,7 @@ endef
 #
 # gb_GeneratedPackage_add_dir package destdir srcdir
 define gb_GeneratedPackage_add_dir
-$(call gb_GeneratedPackage_get_target,$(1)) : PACKAGE_DIRS += $(strip $(2)):$(strip $(3))
+$(call gb_GeneratedPackage_get_target,$(1)) : PACKAGE_DIRS += $(strip $(2));$(strip $(3))
 $(call gb_GeneratedPackage_get_clean_target,$(1)) : PACKAGE_DIRS += $(2)
 
 endef


More information about the Libreoffice-commits mailing list