Make-lang.in ($(srcdir)/java/gcj.info): Added `-I..'.

	* 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.

From-SVN: r41743

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 6234de9f67160ddebabb524048635280e8fd7f10..b5b82a16bc4e3de8551a1f6595788026b4ce6e8b 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,10 @@
+2001-05-01  Tom Tromey  <tromey@redhat.com>
+
+       * 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  <per@bothner.com>
 
        * 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 ca3653f2d67ace2743248981af908998ed1635c1..a2a73bc8fe8231d084adfbcb2d85a808d062e043 100644 (file)
--- 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 f78c525ec944aff9cd410ce968caba8048bdd7b3..229f38d7a21297f96eba2c1e7356d9668749146e 100644 (file)
--- 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