This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Patch to GFDL generated manpages, with gpl(7), gfdl(7), fsf-funding(7)
- To: <gcc-patches at gcc dot gnu dot org>
- Subject: Patch to GFDL generated manpages, with gpl(7), gfdl(7), fsf-funding(7)
- From: "Joseph S. Myers" <jsm28 at cam dot ac dot uk>
- Date: Sun, 11 Nov 2001 23:11:36 +0000 (GMT)
This patch implements making the man pages use the GFDL, hopefully
following the FSF recommendations. I also made the CPP manual include
the GFDL as a section, since it is a separate manual from the GCC one
(whereas the manpages are part of a manual, which as a collection of
manpages (actually two collections, intersection gfdl(7), one from the
GCC manual and one from the CPP manual) includes the gpl(7),
fsf-funding(7), gfdl(7) manpages).
I haven't touched other manuals from which man pages aren't generated.
In particular, the install manual has no licence, but probably ought
to be under the GFDL (and probably ought also to have some years older
than 2001 in its copyright notice since it includes a lot of text from
the old install manual). I haven't touched the g77 manpage.
Bootstrapped with no regressions and installed on i686-pc-linux-gnu
(mainline and 3.0 branch - the changes to f/Make-lang.in are slightly
different in the branch patch becuase the lines mentioning $(manext),
which needs to change to $(man1ext), have changed). OK to commit
(mainline and 3.0 branch)?
contrib:
2001-11-11 Joseph S. Myers <jsm28@cam.ac.uk>
* texi2pod.pl: Handle @ifnottex, @iftex and @display. Handle @var
in verbatim blocks specially. Handle @unnumbered, @unnumberedsec
and @center. Allow [a-z] after @enumerate. Handle 0 and numbers
greater than 9 in enumerations.
gcc:
2001-11-11 Joseph S. Myers <jsm28@cam.ac.uk>
* Makefile.in (POD2MAN): Don't include --section=1.
(manext): Rename to man1ext. All users changed.
(man7ext): New.
(man7dir): New.
(generated-manpages): Also depend on $(docdir)/gfdl.7,
$(docdir)/gpl.7, and $(docdir)/fsf-funding.7.
($(docdir)/gcov.1, $(docdir)/cpp.1, $(docdir)/gcc.1): Include
--section=1 in calls to $(POD2MAN).
($(docdir)/gfdl.7, $(docdir)/gpl.7, $(docdir)/fsf-funding.7): New.
(maintainer-clean, install, uninstall): Handle the new man pages.
($(docdir)/cpp.info, cpp.dvi): Depend on fdl.texi.
(installdirs): Create man7dir.
* doc/cpp.texi: Include GFDL in this manual. In the man page,
refer to gfdl(7) for the GFDL. Apply Front Cover and Back Cover
texts to man page. Include gpl(7), gfdl(7) and fsf-funding(7) in
the SEE ALSO man page section.
* doc/gcov.texi: Apply GFDL to man page. Include gpl(7), gfdl(7)
and fsf-funding(7) in the SEE ALSO man page section.
* doc/invoke.texi: Apply GFDL to man page. Include gpl(7),
gfdl(7) and fsf-funding(7) in the SEE ALSO man page section.
* doc/include/fdl.texi, doc/include/funding.texi,
doc/include/gpl.texi: Adjust for conversion by texi2pod.pl.
[ On branch ChangeLog only: ]
* doc/cpp.1, doc/gcc.1, doc/gcov.1: Regenerate.
* doc/gpl.7, doc/gfdl.7, doc/fsf-funding.7: New.
gcc/cp:
2001-11-11 Joseph S. Myers <jsm28@cam.ac.uk>
* Make-lang.in: Change all uses of $(manext) to $(man1ext).
gcc/f:
2001-11-11 Joseph S. Myers <jsm28@cam.ac.uk>
* Make-lang.in: Change all uses of $(manext) to $(man1ext).
--- contrib/texi2pod.pl.orig Tue Jul 3 00:36:44 2001
+++ contrib/texi2pod.pl Wed Nov 7 17:35:31 2001
@@ -71,6 +71,7 @@
|(?:end\s+)?group # @group .. @end group: ditto
|page # @page: ditto
|node # @node: useful only in .info file
+ |(?:end\s+)?ifnottex # @ifnottex .. @end ifnottex: use contents
)\b/x and next;
chomp;
@@ -102,17 +103,17 @@
# Ignore @end foo, where foo is not an operation which may
# cause us to skip, if we are presently skipping.
my $ended = $1;
- next if $skipping && $ended !~ /^(?:ifset|ifclear|ignore|menu)$/;
+ next if $skipping && $ended !~ /^(?:ifset|ifclear|ignore|menu|iftex)$/;
die "\@end $ended without \@$ended at line $.\n" unless defined $endw;
die "\@$endw ended by \@end $ended at line $.\n" unless $ended eq $endw;
$endw = pop @endwstack;
- if ($ended =~ /^(?:ifset|ifclear|ignore|menu)$/) {
+ if ($ended =~ /^(?:ifset|ifclear|ignore|menu|iftex)$/) {
$skipping = pop @skstack;
next;
- } elsif ($ended =~ /^(?:example|smallexample)$/) {
+ } elsif ($ended =~ /^(?:example|smallexample|display)$/) {
$shift = "";
$_ = ""; # need a paragraph break
} elsif ($ended =~ /^(?:itemize|enumerate|table)$/) {
@@ -142,7 +143,7 @@
next;
};
- /^\@(ignore|menu)\b/ and do {
+ /^\@(ignore|menu|iftex)\b/ and do {
push @endwstack, $endw;
push @skstack, $skipping;
$endw = $1;
@@ -171,6 +172,12 @@
s/\@\{/{/g;
s/\@\}/}/g;
s/\@\@/&at;/g;
+
+ # Inside a verbatim block, handle @var specially.
+ if ($shift ne "") {
+ s/\@var\{([^\}]*)\}/<$1>/g;
+ }
+
# POD doesn't interpret E<> inside a verbatim block.
if ($shift eq "") {
s/</</g;
@@ -184,7 +191,7 @@
/^\@set\s+([a-zA-Z0-9_-]+)\s*(.*)$/ and $defs{$1} = $2, next;
/^\@clear\s+([a-zA-Z0-9_-]+)/ and delete $defs{$1}, next;
- /^\@section\s+(.+)$/ and $_ = "\n=head2 $1\n";
+ /^\@(?:section|unnumbered|unnumberedsec|center)\s+(.+)$/ and $_ = "\n=head2 $1\n";
/^\@subsection\s+(.+)$/ and $_ = "\n=head3 $1\n";
# Block command handlers:
@@ -196,7 +203,7 @@
$endw = "itemize";
};
- /^\@enumerate(?:\s+([A-Z0-9]+))?/ and do {
+ /^\@enumerate(?:\s+([a-zA-Z0-9]+))?/ and do {
push @endwstack, $endw;
push @icstack, $ic;
if (defined $1) {
@@ -220,7 +227,7 @@
$endw = "table";
};
- /^\@((?:small)?example)/ and do {
+ /^\@((?:small)?example|display)/ and do {
push @endwstack, $endw;
$endw = $1;
$shift = "\t";
@@ -233,7 +240,8 @@
$_ = "\n=item $ic\<$1\>\n";
} else {
$_ = "\n=item $ic\n";
- $ic =~ y/A-Ya-y1-8/B-Zb-z2-9/;
+ $ic =~ y/A-Ya-y/B-Zb-z/;
+ $ic =~ s/(\d+)/$1 + 1/eg;
}
};
--- gcc/Makefile.in.orig Wed Nov 7 01:28:55 2001
+++ gcc/Makefile.in Sun Nov 11 17:01:23 2001
@@ -125,7 +125,7 @@
MAKEINFOFLAGS =
TEXI2DVI = texi2dvi
TEXI2POD = perl $(srcdir)/../contrib/texi2pod.pl
-POD2MAN = pod2man --center="GNU" --release="gcc-$(version)" --section=1
+POD2MAN = pod2man --center="GNU" --release="gcc-$(version)"
# For GNUmake: let us decide what gets passed to recursive makes.
MAKEOVERRIDES =
@SET_MAKE@
@@ -311,7 +311,8 @@
datadir = @datadir@
localedir = $(datadir)/locale
# Extension (if any) to put in installed man-page filename.
-manext = .1
+man1ext = .1
+man7ext = .7
objext = .o
exeext = @host_exeext@
build_exeext = @build_exeext@
@@ -319,6 +320,7 @@
# Directory in which to put man pages.
mandir = @mandir@
man1dir = $(mandir)/man1
+man7dir = $(mandir)/man7
# Dir for temp files.
tmpdir = /tmp
@@ -2300,7 +2302,7 @@
doc: $(BUILD_INFO) $(GENERATED_MANPAGES) gccbug
info: $(docdir)/cpp.info $(docdir)/gcc.info lang.info $(docdir)/cppinternals.info
-$(docdir)/cpp.info: $(docdir)/cpp.texi
+$(docdir)/cpp.info: $(docdir)/cpp.texi $(docdir)/include/fdl.texi
cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -I doc -I doc/include -o doc/cpp.info doc/cpp.texi
$(docdir)/gcc.info: $(docdir)/gcc.texi $(docdir)/extend.texi \
@@ -2318,7 +2320,7 @@
dvi: gcc.dvi cpp.dvi lang.dvi cppinternals.dvi
# This works with GNU Make's default rule.
-cpp.dvi: $(docdir)/cpp.texi
+cpp.dvi: $(docdir)/cpp.texi $(docdir)/include/fdl.texi
$(TEXI2DVI) -I $(docdir) -I $(docdir)/include $(docdir)/cpp.texi
gcc.dvi: $(docdir)/gcc.texi $(docdir)/extend.texi $(docdir)/install-old.texi \
@@ -2332,12 +2334,13 @@
cppinternals.dvi: $(docdir)/cppinternals.texi
$(TEXI2DVI) -I $(docdir) -I $(docdir)/include $(docdir)/cppinternals.texi
-generated-manpages: $(docdir)/gcov.1 $(docdir)/cpp.1 $(docdir)/gcc.1
+generated-manpages: $(docdir)/gcov.1 $(docdir)/cpp.1 $(docdir)/gcc.1 \
+ $(docdir)/gfdl.7 $(docdir)/gpl.7 $(docdir)/fsf-funding.7
$(docdir)/gcov.1: $(docdir)/gcov.texi
$(STAMP) $(docdir)/gcov.1
-$(TEXI2POD) < $(docdir)/gcov.texi > gcov.pod
- -($(POD2MAN) gcov.pod > $(docdir)/gcov.1.T$$$$ && \
+ -($(POD2MAN) --section=1 gcov.pod > $(docdir)/gcov.1.T$$$$ && \
mv -f $(docdir)/gcov.1.T$$$$ $(docdir)/gcov.1) || \
(rm -f $(docdir)/gcov.1.T$$$$ && exit 1)
-rm -f gcov.pod
@@ -2345,7 +2348,7 @@
$(docdir)/cpp.1: $(docdir)/cpp.texi
$(STAMP) $(docdir)/cpp.1
-$(TEXI2POD) < $(docdir)/cpp.texi > cpp.pod
- -($(POD2MAN) cpp.pod > $(docdir)/cpp.1.T$$$$ && \
+ -($(POD2MAN) --section=1 cpp.pod > $(docdir)/cpp.1.T$$$$ && \
mv -f $(docdir)/cpp.1.T$$$$ $(docdir)/cpp.1) || \
(rm -f $(docdir)/cpp.1.T$$$$ && exit 1)
-rm -f cpp.pod
@@ -2353,11 +2356,36 @@
$(docdir)/gcc.1: $(docdir)/invoke.texi
$(STAMP) $(docdir)/gcc.1
-$(TEXI2POD) < $(docdir)/invoke.texi > gcc.pod
- -($(POD2MAN) gcc.pod > $(docdir)/gcc.1.T$$$$ && \
+ -($(POD2MAN) --section=1 gcc.pod > $(docdir)/gcc.1.T$$$$ && \
mv -f $(docdir)/gcc.1.T$$$$ $(docdir)/gcc.1) || \
(rm -f $(docdir)/gcc.1.T$$$$ && exit 1)
-rm -f gcc.pod
+$(docdir)/gfdl.7: $(docdir)/include/fdl.texi
+ $(STAMP) $(docdir)/gfdl.7
+ -$(TEXI2POD) < $(docdir)/include/fdl.texi > gfdl.pod
+ -($(POD2MAN) --section=7 gfdl.pod > $(docdir)/gfdl.7.T$$$$ && \
+ mv -f $(docdir)/gfdl.7.T$$$$ $(docdir)/gfdl.7) || \
+ (rm -f $(docdir)/gfdl.7.T$$$$ && exit 1)
+ -rm -f gfdl.pod
+
+$(docdir)/gpl.7: $(docdir)/include/gpl.texi
+ $(STAMP) $(docdir)/gpl.7
+ -$(TEXI2POD) < $(docdir)/include/gpl.texi > gpl.pod
+ -($(POD2MAN) --section=7 gpl.pod > $(docdir)/gpl.7.T$$$$ && \
+ mv -f $(docdir)/gpl.7.T$$$$ $(docdir)/gpl.7) || \
+ (rm -f $(docdir)/gpl.7.T$$$$ && exit 1)
+ -rm -f gpl.pod
+
+$(docdir)/fsf-funding.7: $(docdir)/include/funding.texi
+ $(STAMP) $(docdir)/fsf-funding.7
+ -$(TEXI2POD) < $(docdir)/include/funding.texi > fsf-funding.pod
+ -($(POD2MAN) --section=7 fsf-funding.pod \
+ > $(docdir)/fsf-funding.7.T$$$$ && \
+ mv -f $(docdir)/fsf-funding.7.T$$$$ $(docdir)/fsf-funding.7) || \
+ (rm -f $(docdir)/fsf-funding.7.T$$$$ && exit 1)
+ -rm -f fsf-funding.pod
+
#
# Deletion of files made during compilation.
# There are four levels of this:
@@ -2487,6 +2515,7 @@
-rm -f $(docdir)/cpp.info* $(docdir)/gcc.info*
-rm -f $(docdir)/cppinternals.info*
-rm -f $(docdir)/gcov.1 $(docdir)/cpp.1 $(docdir)/gcc.1
+ -rm -f $(docdir)/fsf-funding.7 $(docdir)/gfdl.7 $(docdir)/gpl.7
#
# Entry points `install' and `uninstall'.
# Also use `install-collect2' to install collect2 when the config files don't.
@@ -2574,6 +2603,7 @@
-parent=`echo $(man1dir)|sed -e 's@/[^/]*$$@@'`; \
if [ -d $$parent ] ; then true ; else mkdir $$parent ; chmod a+rx $$parent ; fi
-if [ -d $(man1dir) ] ; then true ; else mkdir $(man1dir) ; chmod a+rx $(man1dir) ; fi
+ -if [ -d $(man7dir) ] ; then true ; else mkdir $(man7dir) ; chmod a+rx $(man7dir) ; fi
# Install the compiler executables built during cross compilation.
install-common: native $(EXTRA_PARTS) lang.install-common
@@ -2679,20 +2709,29 @@
# Install the man pages.
install-man: installdirs $(GENERATED_MANPAGES) lang.install-man
-if [ -f gcc-cross$(exeext) ] ; then \
- rm -f $(man1dir)/$(GCC_CROSS_NAME)$(manext); \
- $(INSTALL_DATA) $(docdir)/gcc.1 $(man1dir)/$(GCC_CROSS_NAME)$(manext); \
- chmod a-x $(man1dir)/$(GCC_CROSS_NAME)$(manext); \
+ rm -f $(man1dir)/$(GCC_CROSS_NAME)$(man1ext); \
+ $(INSTALL_DATA) $(docdir)/gcc.1 $(man1dir)/$(GCC_CROSS_NAME)$(man1ext); \
+ chmod a-x $(man1dir)/$(GCC_CROSS_NAME)$(man1ext); \
else \
- rm -f $(man1dir)/$(GCC_INSTALL_NAME)$(manext); \
- $(INSTALL_DATA) $(docdir)/gcc.1 $(man1dir)/$(GCC_INSTALL_NAME)$(manext); \
- chmod a-x $(man1dir)/$(GCC_INSTALL_NAME)$(manext); \
+ rm -f $(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \
+ $(INSTALL_DATA) $(docdir)/gcc.1 $(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \
+ chmod a-x $(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \
fi
- -rm -f $(man1dir)/cpp$(manext)
- -$(INSTALL_DATA) $(docdir)/cpp.1 $(man1dir)/cpp$(manext)
- -chmod a-x $(man1dir)/cpp$(manext)
- -rm -f $(man1dir)/gcov$(manext)
- -$(INSTALL_DATA) $(docdir)/gcov.1 $(man1dir)/gcov$(manext)
- -chmod a-x $(man1dir)/gcov$(manext)
+ -rm -f $(man1dir)/cpp$(man1ext)
+ -$(INSTALL_DATA) $(docdir)/cpp.1 $(man1dir)/cpp$(man1ext)
+ -chmod a-x $(man1dir)/cpp$(man1ext)
+ -rm -f $(man1dir)/gcov$(man1ext)
+ -$(INSTALL_DATA) $(docdir)/gcov.1 $(man1dir)/gcov$(man1ext)
+ -chmod a-x $(man1dir)/gcov$(man1ext)
+ -rm -f $(man7dir)/fsf-funding$(man7ext)
+ -$(INSTALL_DATA) $(docdir)/fsf-funding.7 $(man7dir)/fsf-funding$(man7ext)
+ -chmod a-x $(man7dir)/fsf-funding$(man7ext)
+ -rm -f $(man7dir)/gfdl$(man7ext)
+ -$(INSTALL_DATA) $(docdir)/gfdl.7 $(man7dir)/gfdl$(man7ext)
+ -chmod a-x $(man7dir)/gfdl$(man7ext)
+ -rm -f $(man7dir)/gpl$(man7ext)
+ -$(INSTALL_DATA) $(docdir)/gpl.7 $(man7dir)/gpl$(man7ext)
+ -chmod a-x $(man7dir)/gpl$(man7ext)
# Install the library.
install-libgcc: libgcc.mk libgcc.a installdirs
@@ -2803,11 +2842,11 @@
-rm -rf $(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext)
-rm -rf $(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext)
-rm -rf $(bindir)/$(GCOV_INSTALL_NAME)$(exeext)
- -rm -rf $(man1dir)/$(GCC_INSTALL_NAME)$(manext)
- -rm -rf $(man1dir)/$(GCC_CROSS_NAME)$(manext)
- -rm -rf $(man1dir)/cpp$(manext)
- -rm -rf $(man1dir)/protoize$(manext)
- -rm -rf $(man1dir)/unprotoize$(manext)
+ -rm -rf $(man1dir)/$(GCC_INSTALL_NAME)$(man1ext)
+ -rm -rf $(man1dir)/$(GCC_CROSS_NAME)$(man1ext)
+ -rm -rf $(man1dir)/cpp$(man1ext)
+ -rm -rf $(man1dir)/protoize$(man1ext)
+ -rm -rf $(man1dir)/unprotoize$(man1ext)
-rm -f $(infodir)/cpp.info* $(infodir)/gcc.info*
-rm -f $(infodir)/cppinternals.info*
#
--- gcc/doc/cpp.texi.orig Wed Oct 17 11:10:08 2001
+++ gcc/doc/cpp.texi Sun Nov 11 16:56:48 2001
@@ -15,22 +15,18 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.1 or
any later version published by the Free Software Foundation. A copy of
-the license is included in the accompanying manual for GCC, in the
-section ``GNU Free Documentation License''.
+the license is included in the
@c man end
-@end macro
-
-@c The manpage doesn't have Front-Cover and Back-Cover Texts, but the
-@c complete manual does. -zw
-
+section entitled ``GNU Free Documentation License''.
@ignore
@c man begin COPYRIGHT
-This manual contains no Invariant Sections, and has no Front-Cover Texts
-or Back-Cover Texts.
+man page gfdl(7).
@c man end
@end ignore
+@end macro
@macro covertexts
+@c man begin COPYRIGHT
This manual contains no Invariant Sections. The Front-Cover Texts are
(a) (see below), and the Back-Cover Texts are (b) (see below).
@@ -43,6 +39,7 @@
You have freedom to copy and modify this GNU Manual, like GNU
software. Copies published by the Free Software Foundation raise
funds for GNU development.
+@c man end
@end macro
@macro gcctabopt{body}
@@ -92,6 +89,7 @@
* Traditional Mode::
* Implementation Details::
* Invocation::
+* GNU Free Documentation License::
* Index of Directives::
* Concept Index::
@@ -3806,6 +3804,7 @@
Only the most useful options are listed here; see below for the remainder.
@c man end
@c man begin SEEALSO
+gpl(7), gfdl(7), fsf-funding(7),
gcc(1), as(1), ld(1), and the Info entries for @file{cpp}, @file{gcc}, and
@file{binutils}.
@c man end
@@ -4279,6 +4278,8 @@
preprocess as normal. With two dashes, exit immediately.
@end table
@c man end
+
+@include fdl.texi
@page
@node Index of Directives
--- gcc/doc/gcov.texi.orig Thu Nov 1 21:44:21 2001
+++ gcc/doc/gcov.texi Tue Nov 6 23:01:56 2001
@@ -6,20 +6,23 @@
@c man begin COPYRIGHT
Copyright @copyright{} 1996, 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
-Permission is granted to make and distribute verbatim copies of this
-manual provided the copyright notice and this permission notice are
-preserved on all copies.
-
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided also that the
-entire resulting derived work is distributed under the terms of a
-permission notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that this permission notice may be included in translations
-approved by the Free Software Foundation instead of in the original
-English.
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being ``GNU General Public License'' and ``Funding
+Free Software'', the Front-Cover texts being (a) (see below), and with
+the Back-Cover Texts being (b) (see below). A copy of the license is
+included in the gfdl(7) man page.
+
+(a) The FSF's Front-Cover Text is:
+
+ A GNU Manual
+
+(b) The FSF's Back-Cover Text is:
+
+ You have freedom to copy and modify this GNU Manual, like GNU
+ software. Copies published by the Free Software Foundation raise
+ funds for GNU development.
@c man end
@c Set file name and title for the man page.
@setfilename gcov
@@ -120,7 +123,7 @@
[@option{-o}|@option{--object-directory} @var{directory}] @var{sourcefile}
@c man end
@c man begin SEEALSO
-gcc(1) and the Info entry for @file{gcc}.
+gpl(7), gfdl(7), fsf-funding(7), gcc(1) and the Info entry for @file{gcc}.
@c man end
@end ignore
--- gcc/doc/invoke.texi.orig Sun Nov 4 02:14:55 2001
+++ gcc/doc/invoke.texi Tue Nov 6 23:02:58 2001
@@ -8,20 +8,23 @@
Copyright @copyright{} 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997,
1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-Permission is granted to make and distribute verbatim copies of this
-manual provided the copyright notice and this permission notice are
-preserved on all copies.
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being ``GNU General Public License'' and ``Funding
+Free Software'', the Front-Cover texts being (a) (see below), and with
+the Back-Cover Texts being (b) (see below). A copy of the license is
+included in the gfdl(7) man page.
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided also that the
-entire resulting derived work is distributed under the terms of a
-permission notice identical to this one.
+(a) The FSF's Front-Cover Text is:
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that this permission notice may be included in translations
-approved by the Free Software Foundation instead of in the original
-English.
+ A GNU Manual
+
+(b) The FSF's Back-Cover Text is:
+
+ You have freedom to copy and modify this GNU Manual, like GNU
+ software. Copies published by the Free Software Foundation raise
+ funds for GNU development.
@c man end
@c Set file name and title for the man page.
@setfilename gcc
@@ -39,6 +42,7 @@
remainder. @samp{g++} accepts mostly the same options as @samp{gcc}.
@c man end
@c man begin SEEALSO
+gpl(7), gfdl(7), fsf-funding(7),
cpp(1), gcov(1), g77(1), as(1), ld(1), gdb(1), adb(1), dbx(1), sdb(1)
and the Info entries for @file{gcc}, @file{cpp}, @file{g77}, @file{as},
@file{ld}, @file{binutils} and @file{gdb}.
--- gcc/doc/include/fdl.texi.orig Wed Jul 4 16:16:40 2001
+++ gcc/doc/include/fdl.texi Tue Nov 6 22:53:42 2001
@@ -1,5 +1,20 @@
+@ignore
+@c Set file name and title for man page.
+@setfilename gfdl
+@settitle GNU Free Documentation License
+@c man begin SEEALSO
+gpl(7), fsf-funding(7).
+@c man end
+@c man begin COPYRIGHT
+Copyright @copyright{} 2000 Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+@c man end
+@end ignore
@node GNU Free Documentation License
+@c man begin DESCRIPTION
@unnumbered GNU Free Documentation License
@cindex FDL, GNU Free Documentation License
@@ -401,3 +416,4 @@
@c ispell-local-pdict: "ispell-dict"
@c End:
+@c man end
--- gcc/doc/include/funding.texi.orig Wed Jul 4 16:16:40 2001
+++ gcc/doc/include/funding.texi Tue Nov 6 22:56:13 2001
@@ -1,4 +1,13 @@
+@ignore
+@c Set file name and title for man page.
+@setfilename fsf-funding
+@settitle Funding Free Software
+@c man begin SEEALSO
+gpl(7), gfdl(7).
+@c man end
+@end ignore
@node Funding
+@c man begin DESCRIPTION
@unnumbered Funding Free Software
If you want to have more free software a few years from now, it makes
@@ -40,9 +49,12 @@
By establishing the idea that supporting further development is ``the
proper thing to do'' when distributing free software for a fee, we can
assure a steady flow of resources into making more free software.
+@c man end
@display
-Copyright (C) 1994 Free Software Foundation, Inc.
+@c man begin COPYRIGHT
+Copyright @copyright{} 1994 Free Software Foundation, Inc.
Verbatim copying and redistribution of this section is permitted
without royalty; alteration is not permitted.
+@c man end
@end display
--- gcc/doc/include/gpl.texi.orig Mon Aug 20 17:53:31 2001
+++ gcc/doc/include/gpl.texi Tue Nov 6 22:52:57 2001
@@ -1,4 +1,20 @@
+@ignore
+@c Set file name and title for man page.
+@setfilename gpl
+@settitle GNU General Public License
+@c man begin SEEALSO
+gfdl(7), fsf-funding(7).
+@c man end
+@c man begin COPYRIGHT
+Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc.
+59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+@c man end
+@end ignore
@node Copying
+@c man begin DESCRIPTION
@unnumbered GNU GENERAL PUBLIC LICENSE
@center Version 2, June 1991
@@ -390,3 +406,4 @@
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
Public License instead of this License.
+@c man end
--- gcc/cp/Make-lang.in.orig Fri Nov 9 17:05:09 2001
+++ gcc/cp/Make-lang.in Sun Nov 11 18:13:49 2001
@@ -187,13 +187,13 @@
c++.install-man: installdirs $(srcdir)/cp/g++.1
-if [ -f cc1plus$(exeext) ] ; then \
if [ -f g++-cross$(exeext) ] ; then \
- rm -f $(man1dir)/$(GXX_CROSS_NAME)$(manext); \
- $(INSTALL_DATA) $(srcdir)/cp/g++.1 $(man1dir)/$(GXX_CROSS_NAME)$(manext); \
- chmod a-x $(man1dir)/$(GXX_CROSS_NAME)$(manext); \
+ rm -f $(man1dir)/$(GXX_CROSS_NAME)$(man1ext); \
+ $(INSTALL_DATA) $(srcdir)/cp/g++.1 $(man1dir)/$(GXX_CROSS_NAME)$(man1ext); \
+ chmod a-x $(man1dir)/$(GXX_CROSS_NAME)$(man1ext); \
else \
- rm -f $(man1dir)/$(GXX_INSTALL_NAME)$(manext); \
- $(INSTALL_DATA) $(srcdir)/cp/g++.1 $(man1dir)/$(GXX_INSTALL_NAME)$(manext); \
- chmod a-x $(man1dir)/$(GXX_INSTALL_NAME)$(manext); \
+ rm -f $(man1dir)/$(GXX_INSTALL_NAME)$(man1ext); \
+ $(INSTALL_DATA) $(srcdir)/cp/g++.1 $(man1dir)/$(GXX_INSTALL_NAME)$(man1ext); \
+ chmod a-x $(man1dir)/$(GXX_INSTALL_NAME)$(man1ext); \
fi; \
else true; fi
@@ -204,8 +204,8 @@
-rm -rf $(bindir)/$(GXX_CROSS_NAME)$(exeext)
-rm -rf $(bindir)/$(DEMANGLER_INSTALL_NAME)$(exeext)
-rm -rf $(bindir)/$(DEMANGLER_CROSS_NAME)$(exeext)
- -rm -rf $(man1dir)/$(GXX_INSTALL_NAME)$(manext)
- -rm -rf $(man1dir)/$(GXX_CROSS_NAME)$(manext)
+ -rm -rf $(man1dir)/$(GXX_INSTALL_NAME)$(man1ext)
+ -rm -rf $(man1dir)/$(GXX_CROSS_NAME)$(man1ext)
#
# Clean hooks:
# A lot of the ancillary files are deleted by the main makefile.
--- gcc/f/Make-lang.in.orig Fri Nov 9 17:05:11 2001
+++ gcc/f/Make-lang.in Sun Nov 11 18:14:06 2001
@@ -347,13 +347,13 @@
esac
-if [ -f $(libsubdir)/lang-f77.man -a -f f771$(exeext) ] ; then \
if [ -f g77-cross$(exeext) ] ; then \
- rm -f $(man1dir)/$(G77_CROSS_NAME)$(manext); \
- $(INSTALL_DATA) f/g77.1 $(man1dir)/$(G77_CROSS_NAME)$(manext); \
- chmod a-x $(man1dir)/$(G77_CROSS_NAME)$(manext); \
+ rm -f $(man1dir)/$(G77_CROSS_NAME)$(man1ext); \
+ $(INSTALL_DATA) f/g77.1 $(man1dir)/$(G77_CROSS_NAME)$(man1ext); \
+ chmod a-x $(man1dir)/$(G77_CROSS_NAME)$(man1ext); \
else \
- rm -f $(man1dir)/$(G77_INSTALL_NAME)$(manext); \
- $(INSTALL_DATA) f/g77.1 $(man1dir)/$(G77_INSTALL_NAME)$(manext); \
- chmod a-x $(man1dir)/$(G77_INSTALL_NAME)$(manext); \
+ rm -f $(man1dir)/$(G77_INSTALL_NAME)$(man1ext); \
+ $(INSTALL_DATA) f/g77.1 $(man1dir)/$(G77_INSTALL_NAME)$(man1ext); \
+ chmod a-x $(man1dir)/$(G77_INSTALL_NAME)$(man1ext); \
fi; \
else true; fi
rm -f $(libsubdir)/lang-f77.man
@@ -374,8 +374,8 @@
-if [ -f $(libsubdir)/lang-f77.un ]; then \
rm -rf $(bindir)/$(G77_INSTALL_NAME)$(exeext); \
rm -rf $(bindir)/$(G77_CROSS_NAME)$(exeext); \
- rm -rf $(man1dir)/$(G77_INSTALL_NAME)$(manext); \
- rm -rf $(man1dir)/$(G77_CROSS_NAME)$(manext); \
+ rm -rf $(man1dir)/$(G77_INSTALL_NAME)$(man1ext); \
+ rm -rf $(man1dir)/$(G77_CROSS_NAME)$(man1ext); \
rm -rf $(infodir)/g77.info*; \
fi
rm -f $(libsubdir)/lang-f77.un
--
Joseph S. Myers
jsm28@cam.ac.uk