Generate testrun.sh to use relative directory names.

2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 70c31cb..a516723 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-07-02  Roland McGrath  <roland@hack.frob.com>
 
+	* Makefile ($(common-objpfx)testrun.sh): Generate to work relative to
+	containing directory rather than embedding absolute directory names.
+
 	* scripts/check-local-headers.sh: Rewritten using awk.
 	Match by word, not by line.  Print error messages for matches.
 	* Makefile ($(objpfx)check-local-headers.out): Pass AWK in to it.
diff --git a/Makefile b/Makefile
index 287f671..6f2dfa6 100644
--- a/Makefile
+++ b/Makefile
@@ -163,8 +163,10 @@ endif
 $(common-objpfx)testrun.sh: $(common-objpfx)config.make \
 			    $(..)Makeconfig $(..)Makefile
 	(echo '#!/bin/sh'; \
-	 echo "GCONV_PATH='$(common-objpfx)iconvdata' \\"; \
-	 echo 'exec $(run-program-prefix) $${1+"$$@"}'; \
+	 echo 'builddir=`dirname "$$0"`'; \
+	 echo 'GCONV_PATH="$${builddir}/iconvdata" \'; \
+	 echo 'exec $(subst $(common-objdir),"$${builddir}",\
+			    $(run-program-prefix)) $${1+"$$@"}'; \
 	) > $@T
 	chmod a+x $@T
 	mv -f $@T $@