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 6cd528ebea93d338c5d6fb889db729faef75ea48..0a0dfbdf9bf2da314031282257ba504c88354a45 100644 (file)
--- 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 40404a5d1f7e5efcd7f2446f326422968d5be20a..506415236686da6eb9c5d6f57384a42edf6dc5af 100644 (file)
--- 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 ddb682d69f9b01463fe3263a7bd879de3c383503..6da6df0dde9bd5370be706c1f2bd6f7135486f7d 100644 (file)
--- 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 ec6464abb735c5b981aa9e78ac9660d130698958..1b9836f9d93cd0f270cd0dcd77b0c2a1b156e7d8 100644 (file)
--- 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 af8f2a033a8af7aa5c7e07fafd1325136bd93aaa..0104e37d98d5548bba31f6d7b9e6bca9fa84ef21 100644 (file)
--- 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