1From f78dfa39139d528c94d72f27994f337f2fd3b6bd Mon Sep 17 00:00:00 2001
2From: Adrian Calianu <adrian.calianu@enea.com>
3Date: Thu, 25 Feb 2016 16:08:04 +0100
4Subject: [PATCH] Set relative to top_builddir path in Makefile to access
5 test-driver
6
7Signed-off-by: Adrian Calianu <adrian.calianu@enea.com>
8Upstream-Status: Pending
9Bug-Report: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19042
10
11---
12 bin/automake.in | 9 ++++++++-
13 1 file changed, 8 insertions(+), 1 deletion(-)
14
15diff --git a/bin/automake.in b/bin/automake.in
16index a52a489..8377d20 100644
17--- a/bin/automake.in
18+++ b/bin/automake.in
19@@ -324,6 +324,9 @@ my $config_aux_dir_set_in_configure_ac = 0;
20 # $AM_CONFIG_AUX_DIR is prefixed with $(top_srcdir), so it can be used
21 # in Makefiles.
22 my $am_config_aux_dir = '';
23+# Directory used at runtime like running test-driver that should not
24+# depend on $(top_srcdir)
25+my $am_config_rt_aux_dir = '';
26
27 # Directory to search for AC_LIBSOURCE files, as set by AC_CONFIG_LIBOBJ_DIR
28 # in configure.ac.
29@@ -4854,7 +4857,7 @@ sub handle_per_suffix_test
30     {
31       require_conf_file ("parallel-tests", FOREIGN, 'test-driver');
32       define_variable ("${pfx}LOG_DRIVER",
33-                       "\$(SHELL) $am_config_aux_dir/test-driver",
34+                       "\$(SHELL) $am_config_rt_aux_dir/test-driver",
35                        INTERNAL);
36     }
37   my $driver = '$(' . $pfx . 'LOG_DRIVER)';
38@@ -7440,6 +7443,10 @@ sub locate_aux_dir ()
39   $am_config_aux_dir =
40     '$(top_srcdir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir");
41   $am_config_aux_dir =~ s,/*$,,;
42+
43+  $am_config_rt_aux_dir =
44+    '$(top_builddir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir");
45+  $am_config_rt_aux_dir =~ s,/*$,,;
46 }
47
48
49