From: Roland McGrath <roland@gnu.org>
Date: Tue, 29 Jun 2004 23:03:20 +0000 (+0000)
Subject: 2004-06-29  Roland McGrath  <roland@redhat.com>
X-Git-Tag: cvs/fedora-base~361
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f16d3b530955dd1cb7bcc78499f4b4aa957c9b7;p=thirdparty%2Fglibc.git

2004-06-29  Roland McGrath  <roland@redhat.com>

	* Banner: NPTL no longer has its own version number.
	* Makefile (nptl-version): Variable removed.
	* sysdeps/pthread/Makefile (CFLAGS-confstr.c): Set LIBPTHREAD_VERSION
	using $(version), the glibc version number.
---

diff --git a/nptl/Banner b/nptl/Banner
index 53444807bb0..7c1487e7b6d 100644
--- a/nptl/Banner
+++ b/nptl/Banner
@@ -1 +1 @@
-NPTL 0.61 by Ulrich Drepper
+Native POSIX Threads Library by Ulrich Drepper et al
diff --git a/nptl/Makefile b/nptl/Makefile
index c282c6f8ff9..56dd08939f2 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -21,8 +21,6 @@
 #
 subdir	:= nptl
 
-nptl-version := $(shell sed -n 's/^[^0-9]* \([0-9.]*\).*$$/\1/p' Banner)
-
 headers := pthread.h semaphore.h bits/semaphore.h
 
 extra-libs := libpthread
diff --git a/nptl/sysdeps/pthread/Makefile b/nptl/sysdeps/pthread/Makefile
index 05854beecd9..207e10fad20 100644
--- a/nptl/sysdeps/pthread/Makefile
+++ b/nptl/sysdeps/pthread/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -48,5 +48,5 @@ endif
 endif
 
 ifeq ($(subdir),posix)
-CFLAGS-confstr.c += -DLIBPTHREAD_VERSION="\"$(shell sed 's/\(.*\) by .*/\1/' ../nptl/Banner)\""
+CFLAGS-confstr.c += -DLIBPTHREAD_VERSION='"NPTL $(version)"'
 endif