Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Wed, 15 Oct 2014 15:38:43 UTC Commit: 2b2b4e8afdbd92600f7518313bb8ebea75539bf0 https://github.com/geany/geany-plugins/commit/2b2b4e8afdbd92600f7518313bb8eb...

Log Message: ----------- multiterm: Fix vapidir under Automake >= 1.11.0a with VPATH builds

Automake 1.11.0a introduced an incompatible change, that is it now changes directory to `$(srcdir)` before running `valac`.

This means `$(top_srcdir)`-based paths are most likely to be incorrect when building out-of-tree (VPATH) if the user used relative path as srcdir (e.g. invoked configure with something like `../configure`).

To fix that, use the absolute version of `$(top_srcdir)`.

Modified Paths: -------------- multiterm/src/Makefile.am

Modified: multiterm/src/Makefile.am 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -6,7 +6,7 @@ plugin = multiterm geanyplugins_LTLIBRARIES = multiterm.la

multiterm_la_VALAFLAGS = \ - --vapidir $(top_srcdir)/multiterm/src/vapi \ + --vapidir $(abs_top_srcdir)/multiterm/src/vapi \ --pkg gtk+-2.0 \ --pkg geany \ --pkg vte \

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).