From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 3 Aug 2000 04:40:50 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2_1_93~278
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aaf688e85f11a2e6d2fc7b9afbf81e15e146f766;p=thirdparty%2Fglibc.git

Update.

	* Makeconfig (all-subdirs): Add conform.
	* conform/Makefile: Include ../Rules.

	* Makefile (README): Add rules to generate here as well.

2000-08-02  Ulrich Drepper  <drepper@redhat.com>
---

diff --git a/ChangeLog b/ChangeLog
index 6cd528ebea9..0a0dfbdf9bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-08-02  Ulrich Drepper  <drepper@redhat.com>
+
+	* Makeconfig (all-subdirs): Add conform.
+	* conform/Makefile: Include ../Rules.
+
+	* Makefile (README): Add rules to generate here as well.
+
 2000-08-02  Ulrich Drepper  <drepper@redhat.com>
 
 	* version.h (VERSION): Bump to 2.1.92.
diff --git a/Makeconfig b/Makeconfig
index 40404a5d1f7..50641523668 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -818,7 +818,7 @@ all-subdirs = csu assert ctype locale intl catgets math setjmp signal	    \
 	      stdlib stdio-common $(stdio) malloc string wcsmbs time dirent \
 	      grp pwd posix io termios resource misc socket sysvipc gmon    \
 	      gnulib iconv iconvdata wctype manual shadow po argp	    \
-	      crypt $(add-ons) nss localedata timezone rt debug		    \
+	      crypt $(add-ons) nss localedata timezone rt conform debug	    \
 	      $(sysdep-subdirs) $(dlfcn) $(binfmt-subdir)
 all-subdirs := $(filter-out $(sysdep-inhibit-subdirs),$(all-subdirs))
 
diff --git a/Makefile b/Makefile
index ddb682d69f9..6da6df0dde9 100644
--- a/Makefile
+++ b/Makefile
@@ -272,7 +272,14 @@ distribute  :=	README README.libm INSTALL FAQ FAQ.in NOTES NEWS BUGS	\
 distribute := $(strip $(distribute))
 generated := $(generated) stubs.h
 
-README: README.template version.h ; # Make-dist should update README.
+README: README.template version.h
+	-rm -f $@
+	sed -e 's/RELEASE/$(release)/' -e 's/VERSION/$(version)/' < $< > $@
+# Make it unwritable so I won't change it by mistake.
+	chmod 444 $@
+ifeq ($(with-cvs),yes)
+	test ! -d CVS || cvs $(CVSOPTS) commit -m'Remade for $(release)-$(version)' $@
+endif
 
 define format-me
 @rm -f $@
diff --git a/README b/README
index ec6464abb73..1b9836f9d93 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This directory contains the version 2.1.91 release of the GNU C Library.
+This directory contains the version 2.1.92 release of the GNU C Library.
 Many bugs have been fixed since the last release.
 Some bugs surely remain.
 
diff --git a/conform/Makefile b/conform/Makefile
index af8f2a033a8..0104e37d98d 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -23,3 +23,5 @@ subdir	:= conform
 
 distribute = conformtest.pl $(wildcard data/*.h-data) \
 	   $(wildcard data/*/*.h-data)
+
+include ../Rules