[Libreoffice-commits] .: solenv/gbuild

[Matus Kukan]

 solenv/gbuild/Extension.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3082565d6291176ef1fcdc053f9851c82a02d19a
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Thu Jan 5 17:09:21 2012 +0100

    propmerge is not executable

diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 3069408..76fdccf 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -36,7 +36,7 @@ endif
 gb_Extension_XRMEXTARGET := $(call gb_Executable_get_target,xrmex)
 gb_Extension_XRMEXCOMMAND := \
 	$(gb_Helper_set_ld_path) $(gb_Extension_XRMEXTARGET)
-gb_Extension_PROPMERGETARGET := $(call gb_Executable_get_target,propmerge)
+gb_Extension_PROPMERGETARGET := $(OUTDIR)/bin/propmerge
 gb_Extension_PROPMERGECOMMAND := \
 	$(PERL) $(gb_Extension_PROPMERGETARGET)
 gb_Extension_HELPEXTARGET := $(call gb_Executable_get_target,helpex)