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.

5 files changed, 68 insertions, 69 deletions

diff --git a/doc/itron3.0/.cvsignore b/doc/itron3.0/.cvsignore
index 6ed403ac87..f39a7ab68b 100644
--- a/doc/itron3.0/.cvsignore
+++ b/doc/itron3.0/.cvsignore
@@ -22,6 +22,7 @@ itron.toc
 itron.tp
 itron.vr
 mailbox.texi
+mdate-sh
 memorypool.texi
 msgbuffer.texi
 network.texi
diff --git a/doc/itron3.0/Makefile.am b/doc/itron3.0/Makefile.am
index b13c762da4..6b29b18e36 100644
--- a/doc/itron3.0/Makefile.am
+++ b/doc/itron3.0/Makefile.am
@@ -6,94 +6,94 @@
 #  $Id$
 #
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4
 
-PROJECT=itron
+PROJECT = itron
+EDITION = 1
 
 include $(top_srcdir)/project.am
 
-COMMON_FILES=
+COMMON_FILES = $(top_srcdir)/common/setup.texi
 
-GENERATED_FILES= \
-    status.texi \
-    task.texi tasksync.texi semaphore.texi eventflags.texi mailbox.texi \
-    msgbuffer.texi rendezvous.texi interrupt.texi memorypool.texi \
-    fixedblock.texi time.texi config.texi network.texi
+GENERATED_FILES = status.texi task.texi tasksync.texi semaphore.texi \
+    eventflags.texi mailbox.texi msgbuffer.texi rendezvous.texi \
+    interrupt.texi memorypool.texi fixedblock.texi time.texi config.texi \
+    network.texi
 
-FILES= preface.texi
+FILES = preface.texi
 
 info_TEXINFOS = itron.texi
 itron_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)
 
-status.texi: status.t
-	$(BMENU) -p "" \
+$(srcdir)/status.texi: status.t
+	$(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@
 
-task.texi: task.t
-	$(BMENU) -p "" \
+$(srcdir)/task.texi: task.t
+	$(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@
 
-tasksync.texi: tasksync.t
-	$(BMENU) -p "" \
+$(srcdir)/tasksync.texi: tasksync.t
+	$(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@
 
-semaphore.texi: semaphore.t
-	$(BMENU) -p "" \
+$(srcdir)/semaphore.texi: semaphore.t
+	$(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@
 
-eventflags.texi: eventflags.t
-	$(BMENU) -p "" \
+$(srcdir)/eventflags.texi: eventflags.t
+	$(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@
 
-mailbox.texi: mailbox.t
-	$(BMENU) -p "" \
+$(srcdir)/mailbox.texi: mailbox.t
+	$(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@
 
-msgbuffer.texi: msgbuffer.t
-	$(BMENU) -p "" \
+$(srcdir)/msgbuffer.texi: msgbuffer.t
+	$(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@
 
-rendezvous.texi: rendezvous.t
-	$(BMENU) -p "" \
+$(srcdir)/rendezvous.texi: rendezvous.t
+	$(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@
 
-interrupt.texi: interrupt.t
-	$(BMENU) -p "" \
+$(srcdir)/interrupt.texi: interrupt.t
+	$(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@
 
-memorypool.texi: memorypool.t
-	$(BMENU) -p "" \
+$(srcdir)/memorypool.texi: memorypool.t
+	$(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@
 
-fixedblock.texi: fixedblock.t
-	$(BMENU) -p "" \
+$(srcdir)/fixedblock.texi: fixedblock.t
+	$(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@
 
-time.texi: time.t
-	$(BMENU) -p "" \
+$(srcdir)/time.texi: time.t
+	$(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@
 
-config.texi: config.t
-	$(BMENU) -p "" \
+$(srcdir)/config.texi: config.t
+	$(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@
 
-network.texi: network.t
-	$(BMENU) -p "" \
+$(srcdir)/network.texi: network.t
+	$(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@
 
 noinst_SCRIPTS = gen_all gen_section gen_status_shell
 
diff --git a/doc/itron3.0/itron.texi b/doc/itron3.0/itron.texi
index d4d681ed66..4b718cab4d 100644
--- a/doc/itron3.0/itron.texi
+++ b/doc/itron3.0/itron.texi
@@ -25,17 +25,16 @@
 @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 ITRON 3.0 API User's Guide: (itron).   ITRON Guide
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
+@ifset use-ascii
+@dircategory RTEMS On-Line Manual
+@direntry
+* RTEMS ITRON 3.0 API User's Guide: (itron).
+                                       ITRON Guide
+@end direntry
+@end ifset
 
 @c variable substitution info:
 @c
@@ -56,13 +55,6 @@ END-INFO-DIR-ENTRY
 @c  Title Page Stuff
 @c
 
-@set edition @value{RTEMS-EDITION}
-@set version @value{RTEMS-VERSION}
-@c @set update-date @value{RTEMS-UPDATE-DATE}
-@c @set update-month @value{RTEMS-UPDATE-MONTH}
-@set update-date 17 May 1999
-@set update-month May 1999
-
 @c
 @c  I don't really like having a short title page.  --joel
 @c
@@ -74,9 +66,9 @@ END-INFO-DIR-ENTRY
 @finalout
 
 @title RTEMS ITRON 3.0 User's Guide
-@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
 @end titlepage
diff --git a/doc/itron3.0/stamp-vti b/doc/itron3.0/stamp-vti
new file mode 100644
index 0000000000..27e5ccd0cb
--- /dev/null
+++ b/doc/itron3.0/stamp-vti
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
diff --git a/doc/itron3.0/version.texi b/doc/itron3.0/version.texi
new file mode 100644
index 0000000000..27e5ccd0cb
--- /dev/null
+++ b/doc/itron3.0/version.texi
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3