about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--localedata/ChangeLog5
-rw-r--r--localedata/locales/ko_KR2
-rw-r--r--posix/Makefile2
-rw-r--r--version.h4
5 files changed, 17 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 73df1b795d..4333bbdf53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-11-09  Ulrich Drepper  <drepper@redhat.com>
+
+	* version.h (VERSION): Bump to 2.2.
+	(RELEASE): Set to stable.
+
+	* posix/Makefile (tst-dir-ARGS): Fix problem with compiling in
+	source directory.
+
 2000-11-09  H.J. Lu  <hjl@gnu.org>
 
 	* io/Versions (GLIBC_2.2): Add __open64.
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 55c14f0bd3..1a044b8d89 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-09  Ulrich Drepper  <drepper@redhat.com>
+
+	* locales/ko_KR: Fix currency_symbol.
+	Reported by Jungshik Shin <jshin@pantheon.yale.edu>.
+
 2000-11-08  Bruno Haible  <haible@clisp.cons.org>
 
 	* locales/translit_neutral: Tweak <U2014>, <U2212>, <U2219>.
diff --git a/localedata/locales/ko_KR b/localedata/locales/ko_KR
index 04a0ab123a..12348ab40b 100644
--- a/localedata/locales/ko_KR
+++ b/localedata/locales/ko_KR
@@ -9664,7 +9664,7 @@ END LC_CTYPE
 LC_MONETARY
 
 int_curr_symbol		"<U004B><U0052><U0057><U0020>"
-currency_symbol		"<UFFEC>"
+currency_symbol		"<UFFE6>"
 mon_decimal_point	"<U002E>"
 mon_thousands_sep	"<U002C>"
 mon_grouping		3;3
diff --git a/posix/Makefile b/posix/Makefile
index 4329566c0b..e485f5daa3 100644
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -114,7 +114,7 @@ tstgetopt-ARGS = -a -b -cfoobar --required foobar --optional=bazbug \
 
 tst-exec-ARGS = -- $(built-program-cmd)
 tst-spawn-ARGS = -- $(built-program-cmd)
-tst-dir-ARGS = `pwd` "$(objdir)/$(subdir)" "$(common-objdir)" $(objpfx)tst-dir
+tst-dir-ARGS = `pwd` `cd $(common-objdir)/$(subdir); pwd` `cd $(common-objdir); pwd` $(objpfx)tst-dir
 tst-chmod-ARGS = $(objpfx)
 
 tst-fnmatch-ENV = LOCPATH=$(common-objpfx)localedata
diff --git a/version.h b/version.h
index b9f8677308..994a60c5c5 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
 /* This file just defines the current version number of libc.  */
 
-#define RELEASE "development"
-#define VERSION "2.1.97"
+#define RELEASE "stable"
+#define VERSION "2.2"