From cd024632634473d00472cf808feb0c12b0bbb5b5 Mon Sep 17 00:00:00 2001 From: tromey Date: Tue, 1 May 2001 22:21:01 +0000 Subject: [PATCH] * Make-lang.in ($(srcdir)/java/gcj.info): Added `-I..'. (java/gcj.dvi): Added $(srcdir) to TEXINPUTS. * gcj.texi: Updated copyright text. Include fdl.texi. (Top): Link to new node. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@41743 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/java/ChangeLog | 7 +++++ gcc/java/Make-lang.in | 6 ++-- gcc/java/gcj.texi | 79 +++++++++++++++++++++++++-------------------------- 3 files changed, 49 insertions(+), 43 deletions(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 6234de9..b5b82a1 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,10 @@ +2001-05-01 Tom Tromey + + * Make-lang.in ($(srcdir)/java/gcj.info): Added `-I..'. + (java/gcj.dvi): Added $(srcdir) to TEXINPUTS. + * gcj.texi: Updated copyright text. Include fdl.texi. + (Top): Link to new node. + 2001-05-01 Per Bothner * parse.h (REGISTER_IMPORT): Use tree_cons instead of chainon. diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index ca3653f..a2a73bc 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -296,10 +296,10 @@ java/jcf-path.o: java/jcf-path.c $(CONFIG_H) $(SYSTEM_H) java/jcf.h $(srcdir)/java/gcj.info: $(srcdir)/java/gcj.texi if test "x$(BUILD_INFO)" = xinfo; then \ rm -f $(srcdir)/java/gcc.info*; \ - cd $(srcdir)/java && $(MAKEINFO) -o gcj.info gcj.texi; \ + cd $(srcdir)/java && $(MAKEINFO) -I.. -o gcj.info gcj.texi; \ else true; fi java/gcj.dvi: $(srcdir)/java/gcj.texi - TEXINPUTS=${texidir}:$(srcdir)/java:$$TEXINPUTS tex gcj.texi + TEXINPUTS=${texidir}:$(srcdir)/java:$(srcdir):$$TEXINPUTS tex gcj.texi texindex gcj.?? - TEXINPUTS=${texidir}:$(srcdir)/java:$$TEXINPUTS tex gcj.texi + TEXINPUTS=${texidir}:$(srcdir)/java:$(srcdir):$$TEXINPUTS tex gcj.texi diff --git a/gcc/java/gcj.texi b/gcc/java/gcj.texi index f78c525..229f38d 100644 --- a/gcc/java/gcj.texi +++ b/gcc/java/gcj.texi @@ -35,29 +35,23 @@ Copyright (C) @value{copyrights-gcj} 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. - -@ignore -Permission is granted to process this file through Tex and print the -results, provided the printed document carries copying permission -notice identical to this one except for the removal of this paragraph -(this paragraph not being relevant to the printed manual). - -@end ignore -Permission is granted to copy and distribute modified versions of this -manual under the conditions for verbatim copying, provided also that the -sections entitled ``GNU General Public License'' and ``Funding for Free -Software'' are included exactly as in the original, and provided 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 the sections entitled ``GNU General Public License'', and -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'', 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 section entitled +``GNU Free Documentation License''. + +(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. @end ifinfo @titlepage @@ -74,23 +68,23 @@ Published by the Free Software Foundation @* 59 Temple Place - Suite 330@* Boston, MA 02111-1307, USA@* @sp 1 -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 -sections entitled ``GNU General Public License,'' ``Funding for Free -Software,'' and ``Protect Your Freedom---Fight `Look And Feel'@w{}'' are -included exactly as in the original, and provided 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 the section entitled ``GNU General Public License,'' and -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'', 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 section entitled +``GNU Free Documentation License''. + +(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. @end titlepage @page @@ -105,6 +99,8 @@ files and object files, and it can read both Java source code and @menu * Copying:: The GNU General Public License +* GNU Free Documentation License:: + How you can share and copy this manual * Invoking gcj:: Compiler options supported by @code{gcj} * Compatibility:: Compatibility between gcj and other tools for Java * Invoking gcjh:: Generate header files from class files @@ -508,6 +504,9 @@ library. If this is what you want to do, use the GNU Library General Public License instead of this License. +@include fdl.texi + + @node Invoking gcj @chapter Invoking gcj -- 2.7.4