about summary refs log tree commit diff
path: root/iconvdata
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-05-18 11:43:16 +0000
committerUlrich Drepper <drepper@redhat.com>1998-05-18 11:43:16 +0000
commit298f256698b74e76273f51284d213103cbe65987 (patch)
treefc0c45923582d8bb82a6c739f7c0677b443d8ca4 /iconvdata
parent41aa20c243f5b9d51150586651e8b5437cfdb085 (diff)
downloadglibc-298f256698b74e76273f51284d213103cbe65987.tar.gz
glibc-298f256698b74e76273f51284d213103cbe65987.tar.xz
glibc-298f256698b74e76273f51284d213103cbe65987.zip
Update.
1998-05-18 11:38  Ulrich Drepper  <drepper@cygnus.com>

	* iconvdata/run-iconv-test.sh: Extend library-path by iconvdata
	directory.

1998-05-16  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* rpm/Makefile: Delete inclusion of version.mk.

1998-05-17  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* libc.map: Add all libio functions needed libstdc++ with version
	2.0, sort entries.

1998-05-18  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* iconvdata/Makefile (generated): Add *.stmp files.

1998-05-17  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* timezone/Makefile (testdata, build-testdata): New variables, use
	them in rules for test data.
	($(objpfx)tst-timezone.out): Depend on test data.
	($(testdata)/Europe/Berlin, $(testdata)/Universal,
	$(testdata)/Australia/Melbourne, $(testdata)/America/Sao_Paulo):
	New rules to build test data.
	(tst-timezone-ENV): Pass TZDIR to point to test data.
Diffstat (limited to 'iconvdata')
-rw-r--r--iconvdata/Makefile4
-rwxr-xr-xiconvdata/run-iconv-test.sh5
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.