diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-05-05 10:33:41 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-05-05 10:33:41 +0200 |
| commit | 4eadfa3acd50e80dc07b5c2b00fff46d0f3dd498 (patch) | |
| tree | e45cb50742ab16b48fe8f3a4923a2432f2d9514f /solenv | |
| parent | d28ffc8856295035f297be4613ed68ac05653609 (diff) | |
propmerge is not executable, only a script
Change-Id: I35c88dc5ffe1b4082d0ef9611dd2c698c0d4217e
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Extension.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 3de3af9ce09c..94ef7b3801b8 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -36,7 +36,8 @@ endif gb_Extension_XRMEXTARGET := $(call gb_Executable_get_target_for_build,xrmex) gb_Extension_XRMEXCOMMAND := \ $(gb_Helper_set_ld_path) $(gb_Extension_XRMEXTARGET) -gb_Extension_PROPMERGETARGET := $(call gb_Executable_get_target_for_build,propmerge) +# propmerge is a perl script +gb_Extension_PROPMERGETARGET := $(OUTDIR_FOR_BUILD)/bin/propmerge gb_Extension_PROPMERGECOMMAND := \ $(PERL) $(gb_Extension_PROPMERGETARGET) gb_Extension_HELPEXTARGET := $(call gb_Executable_get_target_for_build,helpex) |