2001-05-19 Toon Moene <toon@moene.indiv.nluug.nl>

	* Make-lang.in: Have $(MAKEINFO) look into the parent
	directory for includes.
	* g77.texi: Use the GFDL.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42313 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 4d1fe8f..0aeb1a1 100644 (file)
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,9 @@
+2001-05-19  Toon Moene  <toon@moene.indiv.nluug.nl>
+
+       * Make-lang.in: Have $(MAKEINFO) look into the parent
+       directory for includes.
+       * g77.texi: Use the GFDL.
+
 Sun May 13 12:25:06 2001  Mark Mitchell  <mark@codesourcery.com>
 
        * Make-lang.in: Replace all uses of `touch' with $(STAMP).

diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in
index aea2821..5a48def 100644 (file)
--- a/gcc/f/Make-lang.in
+++ b/gcc/f/Make-lang.in
@@ -179,7 +179,7 @@ $(srcdir)/f/g77.info: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \
        esac
        if [ -f lang-f77 ] && [ x$(BUILD_INFO) = xinfo ]; then \
          rm -f $(srcdir)/f/g77.info-*; \
-         cd $(srcdir)/f && $(MAKEINFO) -o g77.info g77.texi; \
+         cd $(srcdir)/f && $(MAKEINFO) -I.. -o g77.info g77.texi; \
        else true; fi
 
 f/g77.dvi: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \

diff --git a/gcc/f/g77.texi b/gcc/f/g77.texi
index 5709f54..d1ab3e4 100644 (file)
--- a/gcc/f/g77.texi
+++ b/gcc/f/g77.texi
@@ -2,8 +2,8 @@
 @c %**start of header
 @setfilename g77.info
 
-@set last-update 2000-12-21
-@set copyrights-g77 1995,1996,1997,1998,1999,2000
+@set last-update 2001-05-19
+@set copyrights-g77 1995,1996,1997,1998,1999,2000,2001
 
 @include root.texi
 
@@ -97,32 +97,24 @@ Boston, MA 02111-1307 USA
 
 Copyright (C) @value{copyrights-g77} 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,'' ``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 sections entitled ``GNU General Public License,''
-``Funding for Free Software,'' and ``Protect Your Freedom---Fight `Look
-And Feel'@w{}'', 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
 
 Contributed by James Craig Burley (@email{@value{email-burley}}).
@@ -163,25 +155,23 @@ Boston, MA 02111-1307, USA@*
 @c Printed copies are available for $? each.@*
 @c ISBN ???
 @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 sections entitled ``GNU General Public License,''
-``Funding for Free Software,'' and ``Protect Your Freedom---Fight `Look
-And Feel'@w{}'', 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
 
@@ -234,6 +224,8 @@ most consistent with the @code{g77} product in that version.
 @menu
 * Copying::         GNU General Public License says
                     how you can copy and share GNU Fortran.
+* GNU Free Documentation License::
+                   How you can copy and share this manual.
 * Contributors::    People who have contributed to GNU Fortran.
 * Funding::         How to help assure continued work for free software.
 * Funding GNU Fortran::  How to help assure continued work on GNU Fortran.
@@ -662,6 +654,8 @@ 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.
 
+@include fdl.texi
+
 @node Contributors
 @unnumbered Contributors to GNU Fortran
 @cindex contributors