diff options
Diffstat (limited to 'iconvdata')
| -rw-r--r-- | iconvdata/Makefile | 4 | ||||
| -rwxr-xr-x | iconvdata/run-iconv-test.sh | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/iconvdata/Makefile b/iconvdata/Makefile index f438b3d49e..c29a4b018d 100644 --- a/iconvdata/Makefile +++ b/iconvdata/Makefile @@ -263,7 +263,9 @@ perl-generated-headers := koi8-r.h latin-greek.h latin-greek-1.h \ iso8859-7.h iso8859-8.h iso8859-10.h \ iso8859-7jp.h -generated = $(sed-generated-headers) $(perl-generated-headers) iconv-test.out +generated = $(sed-generated-headers) $(sed-generated-headers:%.h=%.stmp) \ + $(perl-generated-headers) $(perl-generated-headers:%.h=%.stmp) \ + iconv-test.out ifdef objpfx generated += $(objpfx)gconv-modules endif diff --git a/iconvdata/run-iconv-test.sh b/iconvdata/run-iconv-test.sh index 72b566bdcb..c28bb02270 100755 --- a/iconvdata/run-iconv-test.sh +++ b/iconvdata/run-iconv-test.sh @@ -32,8 +32,11 @@ trap "rm -f $temp1 $temp2" 1 2 3 15 GCONV_PATH=$codir/iconvdata export GCONV_PATH +# We have to have some directories in the library path. +LIBPATH=$codir:$codir/iconvdata + # How the start the iconv(1) program. -ICONV="$codir/elf/ld.so --library-path $codir $codir/iconv/iconv_prog" +ICONV="$codir/elf/ld.so --library-path $LIBPATH $codir/iconv/iconv_prog" # We read the file named TESTS. All non-empty lines not starting with # `#' are interpreted as commands. |