From fc76a6aa19af9606f260993811ac0dee8ec4e886 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Thu, 1 Jun 2000 15:29:01 +0000
Subject: Patch rtemsdoc-4.5.0-rc-8.diff from Ralf Corsepius
 <corsepiu@faw.uni-ulm.de>. Ralf's comments follow:

  Changes:
    * Enhanced versioning:
      - Addition of automake's version.texi support
      - Replacement of rtemsdoc's former versioning support by automake's
        versioning support (Abandoning RTEMS-UPDATE-* etc.)
      - Abandoning setup.texi.in
      - Add EDITION to each documents Makefile.am
      - version.texi support in project.am
      - Addition of maintainer mode (currently only used to prevent incorrectly
        updating timestamps when users touch automake's version.texi timestamp
        files (stamp-vti)).

    * Fixing info dir support
      - Use texinfo's @dircategory and @direntry instead of infos *-DIR-ENTRY
      - $(infodir)/dir is now correctly set up

    * Avoid using temporary files
      - Pipe texts through REPLACE2 into BMENU2 instead of using temporary files.
      - Abandon using bmenu in favor of bmenu2 (bmenu could be removed now)

    * Prepare Makefile.ams for building in a separate buildtree
      - prefix files with $(srcdir) in Makefile.am for files which must be
        generated inside of the source tree

  Notes:
    * rtemsdoc can not yet be build in a separate source-tree, but we
      are very close to it.
    * You as the maintainer of this package now should always use
      --enable-maintainer-mode to configure rtemsdoc.
---
 doc/relnotes/.cvsignore    |  1 +
 doc/relnotes/Makefile.am   | 10 +++++-----
 doc/relnotes/relnotes.texi | 25 +++++++++----------------
 doc/relnotes/stamp-vti     |  3 +++
 doc/relnotes/version.texi  |  3 +++
 5 files changed, 21 insertions(+), 21 deletions(-)
 create mode 100644 doc/relnotes/stamp-vti
 create mode 100644 doc/relnotes/version.texi

(limited to 'doc/relnotes')

diff --git a/doc/relnotes/.cvsignore b/doc/relnotes/.cvsignore
index 9e99f30c9e..9d9078ec68 100644
--- a/doc/relnotes/.cvsignore
+++ b/doc/relnotes/.cvsignore
@@ -1,6 +1,7 @@
 Makefile
 Makefile.in
 index.html
+mdate-sh
 relnotes
 relnotes*.html
 relnotes.aux
diff --git a/doc/relnotes/Makefile.am b/doc/relnotes/Makefile.am
index 1f9c55b5bc..2d366fd31f 100644
--- a/doc/relnotes/Makefile.am
+++ b/doc/relnotes/Makefile.am
@@ -6,16 +6,16 @@
 #  $Id$
 #
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4
 
-PROJECT=relnotes
+PROJECT = relnotes
+EDITION = 1
 
 include $(top_srcdir)/project.am
 
-COMMON_FILES=$(top_srcdir)/common/cpright.texi
+COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi
 
-FILES=install.texi intro.texi probrep.texi relnotes.texi status.texi
+FILES = install.texi intro.texi probrep.texi relnotes.texi status.texi
 
 info_TEXINFOS = relnotes.texi
 relnotes_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)
-
diff --git a/doc/relnotes/relnotes.texi b/doc/relnotes/relnotes.texi
index b18f8b52b6..1d70299e4d 100644
--- a/doc/relnotes/relnotes.texi
+++ b/doc/relnotes/relnotes.texi
@@ -25,17 +25,15 @@
 @c  2.  Why does paragraphindent show up in HTML?
 @c
 
+@include version.texi
 @include ../common/setup.texi
 
-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* RTEMS Release Notes: (relnotes).             Release Notes
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
+@ifset use-ascii
+@dircategory RTEMS On-Line Manual
+@direntry
+* RTEMS Release Notes: (relnotes).     Release Notes
+@end direntry
+@end ifset
 
 @c variable substitution info:
 @c
@@ -48,11 +46,6 @@ END-INFO-DIR-ENTRY
 @c  Title Page Stuff
 @c
 
-@set edition @value{RTEMS-EDITION}
-@set version @value{RTEMS-VERSION}
-@set update-date @value{RTEMS-UPDATE-DATE}
-@set update-month @value{RTEMS-UPDATE-MONTH}
-
 @c
 @c  I don't really like having a short title page.  --joel
 @c
@@ -64,9 +57,9 @@ END-INFO-DIR-ENTRY
 @finalout
 
 @title RTEMS Release Notes
-@subtitle Edition @value{edition}, for RTEMS @value{version}
+@subtitle Edition @value{EDITION}, for RTEMS @value{VERSION}
 @sp 1
-@subtitle @value{update-month}
+@subtitle @value{UPDATED}
 @author On-Line Applications Research Corporation
 @page
 @include ../common/cpright.texi
diff --git a/doc/relnotes/stamp-vti b/doc/relnotes/stamp-vti
new file mode 100644
index 0000000000..27e5ccd0cb
--- /dev/null
+++ b/doc/relnotes/stamp-vti
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
diff --git a/doc/relnotes/version.texi b/doc/relnotes/version.texi
new file mode 100644
index 0000000000..27e5ccd0cb
--- /dev/null
+++ b/doc/relnotes/version.texi
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
-- 
cgit v1.2.3