Add --enable-hardcoded-path-in-tests configure option

3 files changed, 6 insertions, 6 deletions

diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index edf7b093b1..7752013f5b 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -305,7 +305,7 @@ $(objpfx)tst-tables.out: tst-tables.sh $(objpfx)gconv-modules \
 			 $(addprefix $(objpfx),$(modules.so)) \
 			 $(objpfx)tst-table-from $(objpfx)tst-table-to
 	$(SHELL) $< $(common-objpfx) $(common-objpfx)iconvdata/ \
-		'$(run-program-prefix)' > $@
+		'$(test-program-prefix)' > $@
 
 do-tests-clean common-mostlyclean: tst-tables-clean
 
diff --git a/iconvdata/tst-table.sh b/iconvdata/tst-table.sh
index 59166ca511..b0e667d2a9 100755
--- a/iconvdata/tst-table.sh
+++ b/iconvdata/tst-table.sh
@@ -23,7 +23,7 @@
 
 common_objpfx=$1
 objpfx=$2
-run_program_prefix=$3
+test_program_prefix=$3
 charset=$4
 charmap=$5
 
@@ -60,12 +60,12 @@ else
 fi
 
 # iconv in one direction.
-${run_program_prefix} \
+${test_program_prefix} \
 ${objpfx}tst-table-from ${charset} \
   > ${objpfx}tst-${charset}.table
 
 # iconv in the other direction.
-${run_program_prefix} \
+${test_program_prefix} \
 ${objpfx}tst-table-to ${charset} | sort \
   > ${objpfx}tst-${charset}.inverse.table
 
diff --git a/iconvdata/tst-tables.sh b/iconvdata/tst-tables.sh
index ff21aa8082..8f4debdd6b 100755
--- a/iconvdata/tst-tables.sh
+++ b/iconvdata/tst-tables.sh
@@ -23,7 +23,7 @@
 
 common_objpfx=$1
 objpfx=$2
-run_program_prefix=$3
+test_program_prefix=$3
 
 status=0
 
@@ -262,7 +262,7 @@ while read charset charmap; do
   if test "$charset" = GB18030; then echo "This might take a while" 1>&2; fi
   case ${charset} in \#*) continue;; esac
   echo -n "Testing ${charset}" 1>&2
-  if ./tst-table.sh ${common_objpfx} ${objpfx} "${run_program_prefix}" \
+  if ./tst-table.sh ${common_objpfx} ${objpfx} "${test_program_prefix}" \
       ${charset} ${charmap} < /dev/null; then
     echo 1>&2
   else