Skip to content

R
riscv-gcc-1
Commit fd939e46 by Joseph Myers Committed by Joseph Myers
Options

texi2pod.pl: Handle @option and @env. 

contrib:
	* texi2pod.pl: Handle @option and @env.

gcc:
	* configure.in: Require at least texinfo 4.0.  Check for whether
	Pod::Man is sufficiently recent to regenerate GCC manpages.
	* configure:  Regenerate.
	* Makefile.in (TEXI2POD): Call perl explicitly rather than relying
	on #!.
	(GENERATED_MANPAGES): Define.
	(generated-manpages): New target.  Depend on cpp.1 as well as
	gcov.1.
	(install-man): Depend on $(GENERATED_MANPAGES) (defined by
	configure to generated-manpages or empty) rather than on the
	manpages directly.  Remove execute permission from installed
	gcov.1 as well as cpp.1.
	* cpp.1, gcov.1: Regenerate.

From-SVN: r38668
parent 9ef6d39a
Showing with 53 additions and 10 deletions
contrib/ChangeLog
2001-01-03 Joseph S. Myers <jsm28@cam.ac.uk>
* texi2pod.pl: Handle @option and @env.
2001-01-03 Mike Stump <mrs@wrs.com>
* snapshot: Update to account for java libraries.
......
contrib/texi2pod.pl
......@@ -251,7 +251,7 @@ sub postprocess
# Formatting commands.
s/\@(?:dfn|var|emph|cite|i)\{([^\}]*)\}/I<$1>/g;
s/\@(?:code|kbd)\{([^\}]*)\}/C<$1>/g;
s/\@(?:samp|strong|key|b)\{([^\}]*)\}/B<$1>/g;
s/\@(?:samp|strong|key|option|env|b)\{([^\}]*)\}/B<$1>/g;
s/\@sc\{([^\}]*)\}/\U$1/g;
s/\@file\{([^\}]*)\}/F<$1>/g;
s/\@w\{([^\}]*)\}/S<$1>/g;
......
gcc/ChangeLog
2001-01-03 Joseph S. Myers <jsm28@cam.ac.uk>
* configure.in: Require at least texinfo 4.0. Check for whether
Pod::Man is sufficiently recent to regenerate GCC manpages.
* configure: Regenerate.
* Makefile.in (TEXI2POD): Call perl explicitly rather than relying
on #!.
(GENERATED_MANPAGES): Define.
(generated-manpages): New target. Depend on cpp.1 as well as
gcov.1.
(install-man): Depend on $(GENERATED_MANPAGES) (defined by
configure to generated-manpages or empty) rather than on the
manpages directly. Remove execute permission from installed
gcov.1 as well as cpp.1.
* cpp.1, gcov.1: Regenerate.
2001-01-03 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* builtins.c (expand_builtin_strncmp): Use host_integerp and
......
gcc/Makefile.in
......@@ -129,7 +129,7 @@ INSTALL_DATA = @INSTALL_DATA@
MAKEINFO = @MAKEINFO@
MAKEINFOFLAGS =
TEXI2DVI = texi2dvi
TEXI2POD = $(srcdir)/../contrib/texi2pod.pl
TEXI2POD = perl $(srcdir)/../contrib/texi2pod.pl
POD2MAN = pod2man --center="GNU" --release="gcc-$(version)" --section=1
# For GNUmake: let us decide what gets passed to recursive makes.
MAKEOVERRIDES =
......@@ -469,6 +469,9 @@ INSTALL_HEADERS=install-headers
# Control whether Info documentation is built and installed.
BUILD_INFO = @BUILD_INFO@
# Control whether manpages generated by texi2pod.pl can be rebuilt.
GENERATED_MANPAGES = @GENERATED_MANPAGES@
# Additional directories of header files to run fixincludes on.
# These should be directories searched automatically by default
# just as /usr/include is.
......@@ -2201,6 +2204,8 @@ cpp.dvi: $(srcdir)/cpp.texi
texindex cpp.??
TEXINPUTS=${texidir}:$(srcdir):$$TEXINPUTS tex cpp.texi
generated-manpages: $(srcdir)/gcov.1 $(srcdir)/cpp.1
$(srcdir)/gcov.1: $(srcdir)/gcov.texi
$(TEXI2POD) < $(srcdir)/gcov.texi > gcov.pod
($(POD2MAN) gcov.pod > $(srcdir)/gcov.1.T$$$$ && \
......@@ -2208,6 +2213,13 @@ $(srcdir)/gcov.1: $(srcdir)/gcov.texi
(rm -f $(srcdir)/gcov.1.T$$$$ && exit 1)
rm -f gcov.pod
$(srcdir)/cpp.1: $(srcdir)/cpp.texi
$(TEXI2POD) < $(srcdir)/cpp.texi > cpp.pod
($(POD2MAN) cpp.pod > $(srcdir)/cpp.1.T$$$$ && \
mv -f $(srcdir)/cpp.1.T$$$$ $(srcdir)/cpp.1) || \
(rm -f $(srcdir)/cpp.1.T$$$$ && exit 1)
rm -f cpp.pod
#
# Deletion of files made during compilation.
# There are four levels of this:
......@@ -2334,7 +2346,7 @@ maintainer-clean:
-rm -f cpp.??s cpp.*aux
-rm -f gcc.??s gcc.*aux
-rm -f $(srcdir)/cpp.info* $(srcdir)/gcc.info* $(srcdir)/c-tree.info*
-rm -f $(srcdir)/gcov.1
-rm -f $(srcdir)/gcov.1 $(srcdir)/cpp.1
#
# Entry points `install' and `uninstall'.
# Also use `install-collect2' to install collect2 when the config files don't.
......@@ -2523,7 +2535,7 @@ install-info: doc installdirs lang.install-info
-chmod a-x $(infodir)/cpp.info* $(infodir)/gcc.info*
# Install the man pages.
install-man: installdirs $(srcdir)/gcc.1 $(srcdir)/cpp.1 $(srcdir)/gcov.1 lang.install-man
install-man: installdirs $(srcdir)/gcc.1 $(GENERATED_MANPAGES) lang.install-man
-if [ -f gcc-cross$(exeext) ] ; then \
rm -f $(man1dir)/$(GCC_CROSS_NAME)$(manext); \
$(INSTALL_DATA) $(srcdir)/gcc.1 $(man1dir)/$(GCC_CROSS_NAME)$(manext); \
......@@ -2535,9 +2547,10 @@ install-man: installdirs $(srcdir)/gcc.1 $(srcdir)/cpp.1 $(srcdir)/gcov.1 lang.i
fi
-rm -f $(man1dir)/cpp$(manext)
-$(INSTALL_DATA) $(srcdir)/cpp.1 $(man1dir)/cpp$(manext)
-chmod a-x $(man1dir)/cpp$(manext)
-rm -f $(man1dir)/gcov$(manext)
-$(INSTALL_DATA) $(srcdir)/gcov.1 $(man1dir)/gcov$(manext)
-chmod a-x $(man1dir)/cpp$(manext)
-chmod a-x $(man1dir)/gcov$(manext)
# Install the library.
install-libgcc: libgcc.a installdirs
......
gcc/configure.in
# configure.in for GNU CC
# Process this file with autoconf to generate a configuration script.
# Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
# Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
#This file is part of GNU CC.
......@@ -456,7 +456,7 @@ else
# that we can use it.
gcc_AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
[GNU texinfo.* \([0-9][0-9.]*\)],
[3.1[2-9] | 3.[2-9][0-9] | 4.* | 1.6[89] | 1.7[0-9]])
[4.*])
fi
if test $gcc_cv_prog_makeinfo_modern = no; then
......@@ -468,6 +468,16 @@ else
BUILD_INFO=info AC_SUBST(BUILD_INFO)
fi
# Is pod2man recent enough to regenerate manpages?
AC_MSG_CHECKING([for recent Pod::Man])
if perl -e 'use 1.10 Pod::Man' >/dev/null 2>&1; then
AC_MSG_RESULT(yes)
GENERATED_MANPAGES=generated-manpages AC_SUBST(GENERATED_MANPAGES)
else
AC_MSG_RESULT(no)
GENERATED_MANPAGES=
fi
# How about lex?
dnl Don't use AC_PROG_LEX; we insist on flex.
dnl LEXLIB is not useful in gcc.
......
gcc/gcov.1
.\" Automatically generated by Pod::Man version 1.1
.\" Tue Nov 21 17:46:08 2000
.\" Wed Jan 3 20:06:14 2001
.\"
.\" Standard preamble:
.\" ======================================================================
......@@ -138,7 +138,7 @@
.\" ======================================================================
.\"
.IX Title "GCOV 1"
.TH GCOV 1 "gcc-2.97" "2000-11-21" "GNU"
.TH GCOV 1 "gcc-2.97" "2001-01-03" "GNU"
.UC
.SH "NAME"
gcov \- coverage testing tool
......@@ -396,7 +396,7 @@ many times the result was 1.
\&\fIgcc\fR\|(1) and the Info entry for \fIgcc\fR.
.SH "COPYRIGHT"
.IX Header "COPYRIGHT"
Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
Copyright (c) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
.PP
Permission is granted to make and distribute verbatim copies of this
manual provided the copyright notice and this permission notice are
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment