From 9cab9361868eeb95b95d5d3e7960443d91284189 Mon Sep 17 00:00:00 2001 From: Andreas Fritiofson Date: Thu, 25 Jul 2013 03:21:53 +0200 Subject: [PATCH] Fix out-of-tree build The current AX_CONFIG_SUBDIR_OPTION macro assumes that $srcdir is a relative path. If it is not, jimtcl/configure.gnu is generated such that an out-of-tree build will fail at the configure step unless the build dir is a sibling to the source dir. Change the generated jimtcl/configure.gnu wrapper to use the same `dirname $0` trick as jimtcl/configure (which itself is a wrapper around autosetup). Change-Id: I0fb19ae114ba37169b422b28313262f9bd83eb6f Signed-off-by: Andreas Fritiofson Reviewed-on: http://openocd.zylin.com/1528 Tested-by: jenkins Reviewed-by: Spencer Oliver Reviewed-by: Xiaofan --- config_subdir.m4 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config_subdir.m4 b/config_subdir.m4 index 4102dfd32..1c7909853 100644 --- a/config_subdir.m4 +++ b/config_subdir.m4 @@ -21,7 +21,6 @@ AC_DEFUN([AX_CONFIG_SUBDIR_OPTION], AC_CONFIG_SUBDIRS([$1]) m4_ifblank([$2], [rm -f $srcdir/$1/configure.gnu], -[printf "#!/bin/sh -"\$"SHELL "../$srcdir/$1/configure" $2 \""\$"@"\" > "$srcdir/$1/configure.gnu" +[echo -e '#!/bin/sh\nexec "`dirname "'\$'0"`/configure" $2 "'\$'@"' > "$srcdir/$1/configure.gnu" ]) ])