Generate testrun.sh to use relative directory names.

diff --git a/ChangeLog b/ChangeLog
index 70c31cb745ae975c1f48df68bbff97d53a8e8805..a5167235e74fdb7c82f8c14f305ea7c3a98bfabf 100644 (file)
--- 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 287f671c17748a13c548b4c56afe9b0d4ba7bd09..6f2dfa66fa9e6a75e40a2a635232beab1c00dad1 100644 (file)
--- 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 $@