blob: 1f717223348c46c0d4f6dd658f832e6921c6c7fd [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08001From 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
Patrick Williamsd8c66bc2016-06-20 12:57:21 -05006
7Signed-off-by: Adrian Calianu <adrian.calianu@enea.com>
8Upstream-Status: Pending
9Bug-Report: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19042
10
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080011---
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
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050017--- a/bin/automake.in
18+++ b/bin/automake.in
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080019@@ -324,6 +324,9 @@ my $config_aux_dir_set_in_configure_ac = 0;
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050020 # $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 = '';
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080026
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050027 # Directory to search for AC_LIBSOURCE files, as set by AC_CONFIG_LIBOBJ_DIR
28 # in configure.ac.
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080029@@ -4854,7 +4857,7 @@ sub handle_per_suffix_test
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050030 {
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)';
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080038@@ -7440,6 +7443,10 @@ sub locate_aux_dir ()
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050039 $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 }
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080047
48