From 5134213014448b459864d05ba6f556344c7b079f Mon Sep 17 00:00:00 2001 From: joseph Date: Fri, 9 Nov 2012 22:50:35 +0000 Subject: Merge changes between r21563 and r21628 from /fsf/trunk. git-svn-id: svn://svn.eglibc.org/trunk@21629 7b3dc134-2b1b-0410-93df-9e9f96275f8d --- libc/manual/Makefile | 12 +++++++++--- libc/manual/filesys.texi | 2 +- libc/manual/install.texi | 16 +++++++++++++++- libc/manual/libc.texinfo | 13 +++++++++++-- 4 files changed, 36 insertions(+), 7 deletions(-) (limited to 'libc/manual') diff --git a/libc/manual/Makefile b/libc/manual/Makefile index 6fddff059..a05ab8328 100644 --- a/libc/manual/Makefile +++ b/libc/manual/Makefile @@ -114,10 +114,16 @@ $(objpfx)stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\ touch $@ # Package version and bug reporting URL. -$(objpfx)pkgvers.texi: $(objpfx)stamp-pkgvers -$(objpfx)stamp-pkgvers: - echo "@set PKGVERSION $(PKGVERSION_TEXI)" > $(objpfx)pkgvers-tmp +$(objpfx)pkgvers.texi: $(objpfx)stamp-pkgvers ; +$(objpfx)stamp-pkgvers: $(common-objpfx)config.make + echo "@ifclear PKGVERS" > $(objpfx)pkgvers-tmp + echo "@set PKGVERS" >> $(objpfx)pkgvers-tmp + echo "@set PKGVERSION $(PKGVERSION_TEXI)" >> $(objpfx)pkgvers-tmp + if [ "$(PKGVERSION_TEXI)" = "(GNU libc) " ]; then \ + echo "@set PKGVERSION_DEFAULT" >> $(objpfx)pkgvers-tmp; \ + fi echo "@set REPORT_BUGS_TO $(REPORT_BUGS_TEXI)" >> $(objpfx)pkgvers-tmp + echo "@end ifclear" >> $(objpfx)pkgvers-tmp $(move-if-change) $(objpfx)pkgvers-tmp $(objpfx)pkgvers.texi touch $@ diff --git a/libc/manual/filesys.texi b/libc/manual/filesys.texi index 7003f9c47..1b77f069e 100644 --- a/libc/manual/filesys.texi +++ b/libc/manual/filesys.texi @@ -287,7 +287,7 @@ A symbolic link. This member is a BSD extension. The symbol @code{_DIRENT_HAVE_D_TYPE} is defined if this member is available. On systems where it is used, it corresponds to the file type bits in the @code{st_mode} member of -@code{struct statbuf}. If the value cannot be determine the member +@code{struct stat}. If the value cannot be determine the member value is DT_UNKNOWN. These two macros convert between @code{d_type} values and @code{st_mode} values: diff --git a/libc/manual/install.texi b/libc/manual/install.texi index 280de3fc7..1b54051de 100644 --- a/libc/manual/install.texi +++ b/libc/manual/install.texi @@ -2,6 +2,7 @@ @c Makeinfo ignores it when processing the file from the include. @setfilename INSTALL @include macros.texi +@include pkgvers.texi @node Installation, Maintenance, Library Summary, Top @c %MENU% How to install the GNU C Library @@ -173,6 +174,19 @@ the appropriate compiler flags (@samp{-mcpu=i386} will do the trick) to @var{CFLAGS}. If you specify just @samp{--build}, @code{configure} will get confused. + +@item --with-pkgversion=@var{version} +Specify a description, possibly including a build number or build +date, of the binaries being built, to be included in +@option{--version} output from programs installed with @theglibc{}. +For example, @option{--with-pkgversion='FooBar GNU/Linux glibc build +123'}. The default value is @samp{GNU libc}. + +@item --with-bugurl=@var{url} +Specify the URL that users should visit if they wish to report a bug, +to be included in @option{--help} output from programs installed with +@theglibc{}. The default value refers to the main bug-reporting +information for @theglibc{}. @end table To build the library and related programs, type @code{make}. This will @@ -458,7 +472,7 @@ remain unfixed for all eternity, if not longer. It is a good idea to verify that the problem has not already been reported. Bugs are documented in two places: The file @file{BUGS} -describes a number of well known bugs and the upstream GNU C library +describes a number of well known bugs and the central @glibcadj{} bug tracking system has a WWW interface at @url{http://sourceware.org/bugzilla/}. The WWW diff --git a/libc/manual/libc.texinfo b/libc/manual/libc.texinfo index 7bf555001..d720fbdcf 100644 --- a/libc/manual/libc.texinfo +++ b/libc/manual/libc.texinfo @@ -38,8 +38,13 @@ This file documents @theglibc{}. This is @c Disabled (printed editions, see above). @c Edition @value{EDITION} of -@cite{The GNU C Library Reference Manual}, for version @value{VERSION} -@value{PKGVERSION}. +@cite{The GNU C Library Reference Manual}, for version +@ifset PKGVERSION_DEFAULT +@value{VERSION}. +@end ifset +@ifclear PKGVERSION_DEFAULT +@value{VERSION} @value{PKGVERSION}. +@end ifclear Copyright @copyright{} 1993--2012 Free Software Foundation, Inc. @@ -73,8 +78,10 @@ supports it in developing GNU and promoting software freedom.'' @c @center Edition @value{EDITION} @c @sp 1 @center for version @value{VERSION} +@ifclear PKGVERSION_DEFAULT @sp 1 @center @value{PKGVERSION} +@end ifclear @page @vskip 0pt plus 1filll @insertcopying @@ -101,7 +108,9 @@ This is @c Disabled (printed editions, see above). @c Edition @value{EDITION} of @cite{The GNU C Library Reference Manual}, for Version @value{VERSION} +@ifclear PKGVERSION_DEFAULT @value{PKGVERSION} +@end ifclear of @theglibc{}. @end ifnottex -- cgit v1.2.3