From 8b748aed2a9ab4b964faa5722f7a182a060e475c Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 9 Nov 2012 22:13:45 +0000 Subject: Support --with-pkgversion and --with-bugurl. --- manual/Makefile | 16 +++++++++++++++- manual/install.texi | 19 +++++++++++++++++-- manual/libc.texinfo | 17 ++++++++++++++++- 3 files changed, 48 insertions(+), 4 deletions(-) (limited to 'manual') diff --git a/manual/Makefile b/manual/Makefile index 67e13904bb..a05ab8328c 100644 --- a/manual/Makefile +++ b/manual/Makefile @@ -61,7 +61,7 @@ examples = $(filter-out $(foreach d, $(add-ons), ../$d/%.c.texi), \ # Generated files directly included from libc.texinfo. libc-texi-generated = chapters.texi top-menu.texi dir-add.texi \ - libm-err.texi version.texi + libm-err.texi version.texi pkgvers.texi # Add path to build dir for generated files texis-path := $(filter-out $(libc-texi-generated) summary.texi $(examples), \ @@ -113,6 +113,20 @@ $(objpfx)stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\ $(move-if-change) $(objpfx)libm-err-tmp $(objpfx)libm-err.texi touch $@ +# Package version and bug reporting URL. +$(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 $@ + # Generate a file with the version number. $(objpfx)version.texi: $(objpfx)stamp-version ; $(objpfx)stamp-version: $(common-objpfx)config.make diff --git a/manual/install.texi b/manual/install.texi index 4802e699fe..1b54051de3 100644 --- a/manual/install.texi +++ b/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,8 @@ 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 bug tracking system has a +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 interface gives you access to open and closed reports. A closed report @@ -483,7 +498,7 @@ library, you really only need to narrow it down to one library function call, if possible. This should not be too difficult. The final step when you have a simple test case is to report the bug. -Do this using the WWW interface to the bug database. +Do this at @value{REPORT_BUGS_TO}. If you are not sure how a function should behave, and this manual doesn't tell you, that's a bug in the manual. Report that too! If the diff --git a/manual/libc.texinfo b/manual/libc.texinfo index 2c1344ac84..d720fbdcf3 100644 --- a/manual/libc.texinfo +++ b/manual/libc.texinfo @@ -13,6 +13,8 @@ @end direntry @include dir-add.texi +@include pkgvers.texi + @c This tells texinfo.tex to use the real section titles in xrefs in @c place of the node name, when no section title is explicitly given. @set xref-automatic-section-title @@ -36,7 +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}. +@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. @@ -70,6 +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 @@ -96,6 +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 1.4.1