solenv/gbuild/CustomTarget.mk | 2 +-
solenv/gbuild/GeneratedPackage.mk | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit a2979511ce81fb848f5696836066a8243ec14209
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Thu Sep 12 14:18:42 2013 +0200
';' as a delimiter sometimes does not work for unknown reason
Or rather it does work only sometimes.
Change-Id: I97efd718dc6fcf370ca6456432b275e563f62f62
diff --git a/solenv/gbuild/GeneratedPackage.mk
b/solenv/gbuild/GeneratedPackage.mk
index e3c54a9..751e329 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
commit 66589fae35ebed03e8f2859ae4b666b5143f2173
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Thu Sep 12 13:50:35 2013 +0200
gb_CustomTarget_ulfex_rule: add dependency on directory
Change-Id: Ibe00404978cc5b7efc31fe84cb5d0a79a0e13ce3
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 3f6357e..e2dc2fd 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -72,7 +72,7 @@ endif
# $(call gb_CustomTarget_ulfex_rule,ulftargetpattern,ulfsource,pofiles)
define gb_CustomTarget_ulfex_rule
-$(1) : $(2) $(if $(WITH_LANG),$(call
gb_Executable_get_runtime_dependencies,ulfex))
+$(1) : $(2) $(if $(WITH_LANG),$(call
gb_Executable_get_runtime_dependencies,ulfex)) | $(dir $(1)).dir
$$(call gb_CustomTarget_ulfex__command,$$@,$(subst %,$$*,$(strip
$(2))),$(strip $(3)))
endef
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
