From 5b08c6a374a300eb0c5ebcb9677f378430cce0ed Mon Sep 17 00:00:00 2001
From: doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 4 Jul 2004 09:01:40 +0000
Subject: [PATCH] 2004-07-04  Matthias Klose  <doko@debian.org>

        * Make-lang.in: Generate and install gfortran man page.
        * invoke.texi: Remove extra '@c man end'.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@84073 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/fortran/ChangeLog    |  5 +++++
 gcc/fortran/Make-lang.in | 29 +++++++++++++++++++++++------
 gcc/fortran/invoke.texi  |  2 --
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 0b4026aa4ec..922f5ee2a6b 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-04  Matthias Klose  <doko@debian.org>
+
+	* Make-lang.in: Generate and install gfortran man page.
+	* invoke.texi: Remove extra '@c man end'.
+
 2004-07-04  Richard Henderson  <rth@redhat.com>
 
 	* f95-lang.c (gfc_mark_addressable): Don't put_var_into_stack.
diff --git a/gcc/fortran/Make-lang.in b/gcc/fortran/Make-lang.in
index 572f07ae443..de4a0054535 100644
--- a/gcc/fortran/Make-lang.in
+++ b/gcc/fortran/Make-lang.in
@@ -41,10 +41,10 @@
 # $(srcdir) must be set to the gcc/ source directory (*not* gcc/fortran/).
 
 # Actual name to use when installing a native compiler.
-GFORTRAN_INSTALL_NAME = `echo gfortran|sed '$(program_transform_name)'`
+GFORTRAN_INSTALL_NAME := $(shell echo gfortran|sed '$(program_transform_name)')
 
 # Actual name to use when installing a cross-compiler.
-GFORTRAN_CROSS_NAME = `echo gfortran|sed '$(program_transform_cross_name)'`
+GFORTRAN_CROSS_NAME := $(shell echo gfortran|sed '$(program_transform_cross_name)')
 
 #^L
 
@@ -142,8 +142,13 @@ f95.tags: force
 f95.info: doc/gfortran.info
 dvi:: doc/gfortran.dvi
 
-f95.man:
-f95.srcman:
+F95_MANFILES = doc/gfortran.1
+
+f95.man: $(F95_MANFILES)
+
+f95.srcman: $(F95_MANFILES)
+	-cp -p $^ $(srcdir)/doc
+
 f95.srcextra:
 
 check-f95 : check-gfortran
@@ -168,6 +173,11 @@ doc/gfortran.info: $(GFORTRAN_TEXI)
 doc/gfortran.dvi: $(GFORTRAN_TEXI)
 	$(TEXI2DVI) -I $(srcdir)/fortran -I $(abs_docdir)/include -o $@ $<
 
+.INTERMEDIATE: gfortran.pod
+
+gfortran.pod: $(GFORTRAN_TEXI)
+	-$(TEXI2POD) < $(srcdir)/fortran/invoke.texi > $@
+
 #
 # Install hooks:
 # f951 is installed elsewhere as part of $(COMPILERS).
@@ -198,8 +208,13 @@ f95.install-common: installdirs
 
 install-info:: $(DESTDIR)$(infodir)/gfortran.info
 
-f95.install-man: installdirs
-#TODO: write the gfortran man pages
+f95.install-man: installdirs \
+	$(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext)
+
+$(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext): doc/gfortran.1
+	-rm -f $@
+	-$(INSTALL_DATA) $< $@
+	-chmod a-x $@
 
 f95.uninstall:
 	if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
@@ -207,6 +222,7 @@ f95.uninstall:
 	  install-info --delete --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gfortran.info || : ; \
 	else : ; fi; \
 	rm -rf $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext); \
+	rm -rf $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext); \
 	rm -rf $(DESTDIR)$(bindir)/$(GFORTRAN_CROSS_NAME)$(exeext); \
 	rm -rf $(DESTDIR)$(infodir)/gfortran.info*
 
@@ -226,6 +242,7 @@ f95.distclean:
 f95.extraclean:
 f95.maintainer-clean:
 	-rm -f doc/gfortran.info* fortran/gfortran.*aux
+	-rm -f $(docobjdir)/gfortran.1
 
 #
 # Stage hooks:
diff --git a/gcc/fortran/invoke.texi b/gcc/fortran/invoke.texi
index 138951b221e..08ce4624256 100644
--- a/gcc/fortran/invoke.texi
+++ b/gcc/fortran/invoke.texi
@@ -148,8 +148,6 @@ by type.  Explanations are in the following sections.
 -fpackderived  -frepack-arrays}
 @end table
 
-@c man end
-
 @menu
 * Fortran Dialect Options::  Controlling the variant of Fortran language
                              compiled.
-- 
2.11.4.GIT