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, 56 insertions, 60 deletions

diff --git a/doc/supplements/i960/.cvsignore b/doc/supplements/i960/.cvsignore
index 89a693dbf0..fb6030e639 100644
--- a/doc/supplements/i960/.cvsignore
+++ b/doc/supplements/i960/.cvsignore
@@ -22,6 +22,7 @@ i960.vr
 index.html
 intr.t
 intr.texi
+mdate-sh
 memmodel.texi
 timeCVME961.texi
 timeCVME961_.t
diff --git a/doc/supplements/i960/Makefile.am b/doc/supplements/i960/Makefile.am
index e0ecf513fa..43ab3e6c30 100644
--- a/doc/supplements/i960/Makefile.am
+++ b/doc/supplements/i960/Makefile.am
@@ -6,20 +6,20 @@
 #  $Id$
 #
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4
 
-PROJECT=i960
+PROJECT = i960
+EDITION = 1
 
 include $(top_srcdir)/project.am
 include $(top_srcdir)/supplements/supplement.am
 
-COMMON_FILES=$(top_srcdir)/common/cpright.texi $(top_builddir)/common/setup.texi
+GENERATED_FILES = cpumodel.texi callconv.texi memmodel.texi intr.texi \
+    fatalerr.texi bsp.texi cputable.texi timing.texi wksheets.texi \
+    timeCVME961.texi
+COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi
 
-GENERATED_FILES=\
-  cpumodel.texi callconv.texi memmodel.texi intr.texi fatalerr.texi \
-  bsp.texi cputable.texi timing.texi wksheets.texi timeCVME961.texi
-
-FILES= preface.texi
+FILES = preface.texi
 
 info_TEXINFOS = i960.texi
 i960_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)
@@ -28,65 +28,62 @@ i960_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)
 #  Chapters which get automatic processing
 #
 
-cpumodel.texi: cpumodel.t
-	$(BMENU) -p "Preface" \
+$(srcdir)/cpumodel.texi: cpumodel.t
+	$(BMENU2) -p "Preface" \
 	    -u "Top" \
-	    -n "Calling Conventions" $<
+	    -n "Calling Conventions" < $< > $@
 
-callconv.texi: callconv.t
-	$(BMENU) -p "CPU Model Dependent Features Floating Point Unit" \
+$(srcdir)/callconv.texi: callconv.t
+	$(BMENU2) -p "CPU Model Dependent Features Floating Point Unit" \
 	    -u "Top" \
-	    -n "Memory Model" $<
+	    -n "Memory Model" < $< > $@
 
-memmodel.texi: memmodel.t
-	$(BMENU) -p "Calling Conventions Leaf Procedures" \
+$(srcdir)/memmodel.texi: memmodel.t
+	$(BMENU2) -p "Calling Conventions Leaf Procedures" \
 	    -u "Top" \
-	    -n "Interrupt Processing" $<
+	    -n "Interrupt Processing" < $< > $@
 
 # Interrupt Chapter:
 #  1.  Replace Times and Sizes
 #  2.  Build Node Structure
-intr.texi: intr_NOTIMES.t CVME961_TIMES
-	${REPLACE2} -p $(srcdir)/CVME961_TIMES $(srcdir)/intr_NOTIMES.t intr.t
-	$(BMENU) -p "Memory Model Flat Memory Model" \
+$(srcdir)/intr.texi: intr_NOTIMES.t CVME961_TIMES
+	${REPLACE2} -p $(srcdir)/CVME961_TIMES $(srcdir)/intr_NOTIMES.t  | \
+	$(BMENU2) -p "Memory Model Flat Memory Model" \
 	    -u "Top" \
-	    -n "Default Fatal Error Processing" intr.t
-CLEANFILES += intr.t
+	    -n "Default Fatal Error Processing" > $@
 
-fatalerr.texi: fatalerr.t
-	$(BMENU) -p "Interrupt Processing Interrupt Stack" \
+$(srcdir)/fatalerr.texi: fatalerr.t
+	$(BMENU2) -p "Interrupt Processing Interrupt Stack" \
 	    -u "Top" \
-	    -n "Board Support Packages" $<
+	    -n "Board Support Packages" < $< > $@
 
-bsp.texi: bsp.t
-	$(BMENU) -p "Default Fatal Error Processing Default Fatal Error Handler Operations" \
+$(srcdir)/bsp.texi: bsp.t
+	$(BMENU2) -p "Default Fatal Error Processing Default Fatal Error Handler Operations" \
 	    -u "Top" \
-	    -n "Processor Dependent Information Table" $<
+	    -n "Processor Dependent Information Table" < $< > $@
 
-cputable.texi: cputable.t
-	$(BMENU) -p "Board Support Packages Processor Initialization" \
+$(srcdir)/cputable.texi: cputable.t
+	$(BMENU2) -p "Board Support Packages Processor Initialization" \
 	    -u "Top" \
-	    -n "Memory Requirements" $<
-
+	    -n "Memory Requirements" < $< > $@
 
 # Worksheets Chapter:
 #  1.  Obtain the Shared File
 #  2.  Replace Times and Sizes
 #  3.  Build Node Structure
 
-wksheets.texi: $(top_srcdir)/common/wksheets.t  CVME961_TIMES
+$(srcdir)/wksheets.texi: $(top_srcdir)/common/wksheets.t  CVME961_TIMES
 	${REPLACE2} -p $(srcdir)/CVME961_TIMES \
-          $(top_srcdir)/common/wksheets.t wksheets.t
-	$(BMENU) -p "Processor Dependent Information Table CPU Dependent Information Table" \
+          $(top_srcdir)/common/wksheets.t | \
+	$(BMENU2) -p "Processor Dependent Information Table CPU Dependent Information Table" \
 	    -u "Top" \
-	    -n "Timing Specification" wksheets.t
-CLEANFILES += wksheets.t
+	    -n "Timing Specification" > $@
 
 # Timing Specification Chapter:
 #  1.  Copy the Shared File
 #  3.  Build Node Structure
 
-timing.texi: $(top_srcdir)/common/timing.t
+$(srcdir)/timing.texi: $(top_srcdir)/common/timing.t
 	$(BMENU2) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \
             -u "Top" \
             -n "CVME961 Timing Data" < $< > $@
@@ -96,17 +93,16 @@ timing.texi: $(top_srcdir)/common/timing.t
 #  2.  Replace Times and Sizes
 #  3.  Build Node Structure
 
-timeCVME961.texi: $(top_srcdir)/common/timetbl.t timeCVME961.t
+$(srcdir)/timeCVME961.texi: $(top_srcdir)/common/timetbl.t timeCVME961.t
 	cat timeCVME961.t $(top_srcdir)/common/timetbl.t   >timeCVME961_.t
 	@echo                                               >>timeCVME961_.t
 	@echo "@tex"                                        >>timeCVME961_.t
 	@echo "\\global\\advance \\smallskipamount by 4pt"  >>timeCVME961_.t
 	@echo "@end tex"                                    >>timeCVME961_.t
-	${REPLACE2} -p CVME961_TIMES timeCVME961_.t timeCVME961_.t
-	$(BMENU) -p "Timing Specification Terminology" \
+	${REPLACE2} -p CVME961_TIMES timeCVME961_.t | \
+	$(BMENU2) -p "Timing Specification Terminology" \
 	    -u "Top" \
-	    -n "Command and Variable Index" timeCVME961_.t
-	mv timeCVME961_.texi timeCVME961.texi
-CLEANFILES += timeCVME961_.t timeCVME961_.texi
+	    -n "Command and Variable Index" > $@
+CLEANFILES += timeCVME961_.t
 
 EXTRA_DIST = CVME961_TIMES *.t
diff --git a/doc/supplements/i960/i960.texi b/doc/supplements/i960/i960.texi
index ccfc372a7b..93dc23d060 100644
--- a/doc/supplements/i960/i960.texi
+++ b/doc/supplements/i960/i960.texi
@@ -19,27 +19,20 @@
 @c   Master file for the Intel i960 Applications Supplement
 @c
 
+@include version.texi
 @include ../../common/setup.texi
 
-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* RTEMS Intel i960 Applications Supplement (i960):
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
+@ifset use-ascii
+@dircategory RTEMS Target Supplements
+@direntry
+* RTEMS Intel i960 Applications Supplement: (i960).
+@end direntry
+@end ifset
 
 @c
 @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
@@ -51,9 +44,9 @@ END-INFO-DIR-ENTRY
 @finalout
 
 @title RTEMS Intel i960 Applications Supplement 
-@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/supplements/i960/stamp-vti b/doc/supplements/i960/stamp-vti
new file mode 100644
index 0000000000..27e5ccd0cb
--- /dev/null
+++ b/doc/supplements/i960/stamp-vti
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
diff --git a/doc/supplements/i960/version.texi b/doc/supplements/i960/version.texi
new file mode 100644
index 0000000000..27e5ccd0cb
--- /dev/null
+++ b/doc/supplements/i960/version.texi
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3