Encode some macros.

5 files changed, 9 insertions, 13 deletions

diff --git a/gcc/doc/bugreport.texi b/gcc/doc/bugreport.texi
index 9f61bf7..3caf0ad 100644
--- a/gcc/doc/bugreport.texi
+++ b/gcc/doc/bugreport.texi
@@ -85,4 +85,4 @@ suggestions for improvement of GCC are welcome in any case.
 @section How and Where to Report Bugs
 @cindex compiler bugs, reporting
 
-Bugs should be reported to the bug database at @value{BUGURL}.
+Bugs should be reported to the bug database at $$BUGURL$$.
diff --git a/gcc/doc/gcc.texi b/gcc/doc/gcc.texi
index 70bde4a..f0d40fb 100644
--- a/gcc/doc/gcc.texi
+++ b/gcc/doc/gcc.texi
@@ -122,10 +122,8 @@ Printed copies are available for $45 each.
 This manual documents how to use the GNU compilers,
 as well as their features and incompatibilities, and how to report
 bugs.  It corresponds to the compilers
-@ifset VERSION_PACKAGE
-@value{VERSION_PACKAGE}
-@end ifset
-version @value{version-GCC}.
+$$VERSION_PACKAGE$$
+version $$version-GCC$$.
 The internals of the GNU compilers, including how to port them to new
 targets and some information about how to write front ends for new
 languages, are documented in a separate manual.  @xref{Top,,
diff --git a/gcc/doc/gccint.texi b/gcc/doc/gccint.texi
index 67137a9..a81cbc7 100644
--- a/gcc/doc/gccint.texi
+++ b/gcc/doc/gccint.texi
@@ -77,10 +77,8 @@ This file documents the internals of the GNU compilers.
 This manual documents the internals of the GNU compilers, including
 how to port them to new targets and some information about how to
 write front ends for new languages.  It corresponds to the compilers
-@ifset VERSION_PACKAGE
-@value{VERSION_PACKAGE}
-@end ifset
-version @value{version-GCC}.  The use of the GNU compilers is documented in a
+$$VERSION_PACKAGE$$
+version $$version-GCC$$.  The use of the GNU compilers is documented in a
 separate manual.  @xref{Top,, Introduction, gcc, Using the GNU
 Compiler Collection (GCC)}.
 
diff --git a/gcc/doc/include/gcc-common.texi b/gcc/doc/include/gcc-common.texi
index 6448df3..d228b22 100644
--- a/gcc/doc/include/gcc-common.texi
+++ b/gcc/doc/include/gcc-common.texi
@@ -58,14 +58,14 @@
 @c been placed, and before any authors are placed.
 @macro versionsubtitle
 @ifclear DEVELOPMENT
-@subtitle For @sc{gcc} version @value{version-GCC}
+@subtitle For @sc{gcc} version $$version-GCC$$ $$development-GCC$$
 @end ifclear
 @ifset DEVELOPMENT
-@subtitle For @sc{gcc} version @value{version-GCC} (pre-release)
+@subtitle For @sc{gcc} version $$version-GCC$$ $$development-GCC$$
 @end ifset
 @ifset VERSION_PACKAGE
 @sp 1
-@subtitle @value{VERSION_PACKAGE}
+@subtitle $$VERSION_PACKAGE$$
 @end ifset
 @c Even if there are no authors, the second titlepage line should be
 @c forced to the bottom of the page.
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 1755124..671db2d 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -51,7 +51,7 @@ and the Info entries for @file{gcc}, @file{cpp}, @file{as},
 @c man end
 @c man begin BUGS
 For instructions on reporting bugs, see
-@w{@value{BUGURL}}.
+$$BUGURL$$.
 @c man end
 @c man begin AUTHOR
 See the Info entry for @command{gcc}, or