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.
2000-06-01 15:29:01 +00:00
parent c849746bad
commit fc76a6aa19
140 changed files with 1488 additions and 1594 deletions
--- a/doc/FAQ/.cvsignore
+++ b/doc/FAQ/.cvsignore
@@ -24,5 +24,6 @@ endoftime.texi
 freesw.texi
 hwdebugaids.texi
 index.html
+mdate-sh
 projects.texi
 tools.texi
--- a/doc/FAQ/FAQ.texi
+++ b/doc/FAQ/FAQ.texi
@@ -19,27 +19,20 @@
@c   Master file for the RTEMS FAQ
@c

+@include version.texi
@include ../common/setup.texi

-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* RTEMS Frequently Asked Questions (FAQ):
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
+@ifset use-ascii
+@dircategory RTEMS On-Line Manual
+@direntry
+* RTEMS FAQ: (FAQ).	               Frequently Asked Questions.
+@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 Frequently Asked Questions
-@subtitle Edition @value{edition}, for @value{version}
+@subtitle Edition @value{EDITION}, for @value{VERSION}
@sp 1
-@subtitle @value{update-month}
+@subtitle @value{UPDATED}
@author On-Line Applications Research Corporation
@page
@include ../common/cpright.texi
--- a/doc/FAQ/Makefile.am
+++ b/doc/FAQ/Makefile.am
@@ -6,81 +6,81 @@
 #  $Id$
 #

-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4

-PROJECT=FAQ
+PROJECT = FAQ
+EDITION = 1

 include $(top_srcdir)/project.am

-COMMON_FILES=$(top_srcdir)/common/cpright.texi $(top_builddir)/common/setup.texi
+GENERATED_FILES = basic.texi tools.texi concepts.texi build45.texi bsp.texi \
+    debug.texi freesw.texi embeddedinfo.texi hwdebugaids.texi projects.texi \
+    endoftime.texi

-GENERATED_FILES= \
-    basic.texi tools.texi concepts.texi build45.texi bsp.texi debug.texi \
-    freesw.texi embeddedinfo.texi hwdebugaids.texi projects.texi endoftime.texi
+COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi

-FILES=
+FILES =

 info_TEXINFOS = FAQ.texi
-FAQ_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)   
+FAQ_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)

 #
 #  Process Automatically Generated Files
 #

-basic.texi: basic.t
-	$(BMENU) -c -p "Top" \
+$(srcdir)/basic.texi: basic.t
+	$(BMENU2) -c -p "Top" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-tools.texi: tools.t
-	$(BMENU) -c -p "Top" \
+$(srcdir)/tools.texi: tools.t
+	$(BMENU2) -c -p "Top" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-concepts.texi: concepts.t
-	$(BMENU) -c -p "" \
+$(srcdir)/concepts.texi: concepts.t
+	$(BMENU2) -c -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-build45.texi: build45.t
-	$(BMENU) -c -p "" \
+$(srcdir)/build45.texi: build45.t
+	$(BMENU2) -c -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-bsp.texi: bsp.t
-	$(BMENU) -c -p "" \
+$(srcdir)/bsp.texi: bsp.t
+	$(BMENU2) -c -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-debug.texi: debug.t
-	$(BMENU) -c -p "" \
+$(srcdir)/debug.texi: debug.t
+	$(BMENU2) -c -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-freesw.texi: freesw.t
-	$(BMENU) -c -p "" \
+$(srcdir)/freesw.texi: freesw.t
+	$(BMENU2) -c -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-embeddedinfo.texi: embeddedinfo.t
-	$(BMENU) -c -p "" \
+$(srcdir)/embeddedinfo.texi: embeddedinfo.t
+	$(BMENU2) -c -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-hwdebugaids.texi: hwdebugaids.t
-	$(BMENU) -c -p "" \
+$(srcdir)/hwdebugaids.texi: hwdebugaids.t
+	$(BMENU2) -c -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-projects.texi: projects.t
-	$(BMENU) -c -p "" \
+$(srcdir)/projects.texi: projects.t
+	$(BMENU2) -c -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-
-endoftime.texi: endoftime.t
-	$(BMENU) -c -p "" \
+$(srcdir)/endoftime.texi: endoftime.t
+	$(BMENU2) -c -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

 EXTRA_DIST = entry *.t
--- a/doc/FAQ/stamp-vti
+++ b/doc/FAQ/stamp-vti
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/FAQ/version.texi
+++ b/doc/FAQ/version.texi
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/ada_user/.cvsignore
+++ b/doc/ada_user/.cvsignore
@@ -19,5 +19,6 @@ ada_user.toc
 ada_user.tp
 ada_user.vr
 index.html
+mdate-sh
 rtemspie.pdf
 states.pdf
--- a/doc/ada_user/Makefile.am
+++ b/doc/ada_user/Makefile.am
@@ -6,25 +6,29 @@
 #  $Id$
 #

-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4

-PROJECT=ada_user
+PROJECT = ada_user
+EDITION = 1

 include $(top_srcdir)/project.am

-COMMON_FILES= $(top_srcdir)/common/cpright.texi \
-  $(top_srcdir)/user/bsp.texi $(top_srcdir)/user/clock.texi \
-  $(top_srcdir)/user/concepts.texi $(top_srcdir)/user/datatypes.texi \
-  $(top_srcdir)/user/conf.texi $(top_srcdir)/user/dirstat.texi \
-  $(top_srcdir)/user/dpmem.texi $(top_srcdir)/user/event.texi \
-  $(top_srcdir)/user/fatal.texi $(top_srcdir)/user/glossary.texi $(top_srcdir)/user/init.texi \
-  $(top_srcdir)/user/intr.texi $(top_srcdir)/user/io.texi $(top_srcdir)/user/mp.texi $(top_srcdir)/user/msg.texi \
-  $(top_srcdir)/user/overview.texi $(top_srcdir)/user/part.texi $(top_srcdir)/user/preface.texi \
-  $(top_srcdir)/user/region.texi $(top_srcdir)/user/rtmon.texi $(top_srcdir)/user/schedule.texi \
-  $(top_srcdir)/user/sem.texi $(top_srcdir)/user/signal.texi $(top_srcdir)/user/task.texi \
-  $(top_srcdir)/user/timer.texi $(top_srcdir)/user/userext.texi 
+COMMON_FILES = $(top_srcdir)/user/bsp.texi $(top_srcdir)/user/clock.texi \
+    $(top_srcdir)/user/concepts.texi $(top_srcdir)/user/datatypes.texi \
+    $(top_srcdir)/user/conf.texi $(top_srcdir)/user/dirstat.texi \
+    $(top_srcdir)/user/dpmem.texi $(top_srcdir)/user/event.texi \
+    $(top_srcdir)/user/fatal.texi $(top_srcdir)/user/glossary.texi \
+    $(top_srcdir)/user/init.texi $(top_srcdir)/user/intr.texi \
+    $(top_srcdir)/user/io.texi $(top_srcdir)/user/mp.texi \
+    $(top_srcdir)/user/msg.texi $(top_srcdir)/user/overview.texi \
+    $(top_srcdir)/user/part.texi $(top_srcdir)/user/preface.texi \
+    $(top_srcdir)/user/region.texi $(top_srcdir)/user/rtmon.texi \
+    $(top_srcdir)/user/schedule.texi $(top_srcdir)/user/sem.texi \
+    $(top_srcdir)/user/signal.texi $(top_srcdir)/user/task.texi \
+    $(top_srcdir)/user/timer.texi $(top_srcdir)/user/userext.texi \
+    $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi

-FILES= example.texi
+FILES = example.texi

 rtemspie.eps: $(top_srcdir)/user/rtemspie.eps
 	$(LN_S) $<
@@ -41,7 +45,7 @@ states.png: $(top_srcdir)/user/states.png
 CLEANFILES += rtemsarc.png rtemspie.png states.png

 info_TEXINFOS = ada_user.texi
-ada_user_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)   
+ada_user_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)

 if USE_HTML
 html_project_DATA += rtemsarc.png rtemspie.png states.png
@@ -49,4 +53,3 @@ endif

 $(PROJECT).dvi: rtemspie.eps states.eps
 PDF_IMAGES = rtemspie.pdf states.pdf
-
--- a/doc/ada_user/ada_user.texi
+++ b/doc/ada_user/ada_user.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 Ada User: (ada_user).             The Ada User's Guide
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
+@ifset use-ascii
+@dircategory RTEMS On-Line Manual
+@direntry
+* RTEMS Ada User: (ada_user).          The Ada User's Guide
+@end direntry
+@end ifset
+

@c variable substitution info:
@c
@@ -55,11 +54,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
@@ -71,9 +65,9 @@ END-INFO-DIR-ENTRY
@finalout

@title RTEMS Applications Ada 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
@include ../common/cpright.texi
--- a/doc/ada_user/stamp-vti
+++ b/doc/ada_user/stamp-vti
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/ada_user/version.texi
+++ b/doc/ada_user/version.texi
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/bootstrap
+++ b/doc/bootstrap
@@ -90,6 +90,7 @@ clean)
  find . -name 'install-sh' -print | xargs rm -f
  find . -name 'missing' -print | xargs rm -f
  find . -name 'mkinstalldirs' -print | xargs rm -f
+  find . -name 'mdate-sh' -print | xargs rm -f

  test "$quiet" = "true" || echo "removing automake generated Makefile.in files"
  files=`find . -name 'Makefile.am' -print | sed -e 's%\.am%\.in%g'` ;
--- a/doc/bsp_howto/.cvsignore
+++ b/doc/bsp_howto/.cvsignore
@@ -26,6 +26,7 @@ init.texi
 intro.texi
 linkcmds.texi
 makefiles.texi
+mdate-sh
 network.t
 network.texi
 nvmem.texi
--- a/doc/bsp_howto/Makefile.am
+++ b/doc/bsp_howto/Makefile.am
@@ -6,108 +6,108 @@
 #  $Id$
 #

-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4

-PROJECT=bsp_howto
+PROJECT = bsp_howto
+EDITION = 1

 include $(top_srcdir)/project.am

-COMMON_FILES=$(top_srcdir)/common/cpright.texi $(top_builddir)/common/setup.texi
+GENERATED_FILES = intro.texi target.texi makefiles.texi linkcmds.texi \
+    support.texi adaintr.texi init.texi console.texi clock.texi timer.texi \
+    rtc.texi nvmem.texi network.texi shmsupp.texi analog.texi discrete.texi

-GENERATED_FILES= \
-    intro.texi target.texi makefiles.texi linkcmds.texi support.texi \
-    adaintr.texi init.texi console.texi clock.texi timer.texi rtc.texi \
-    nvmem.texi network.texi shmsupp.texi analog.texi discrete.texi
+COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi

-FILES=
+FILES =

 info_TEXINFOS = bsp_howto.texi
-bsp_howto_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)   
+bsp_howto_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)

 #
 #  Process Automatically Generated Files
 #

-intro.texi: intro.t
-	$(BMENU) -p "Top" \
+$(srcdir)/intro.texi: intro.t
+	$(BMENU2) -p "Top" \
 	    -u "Top" \
-	    -n "Target Dependent Files" $<
+	    -n "Target Dependent Files" < $< > $@

-target.texi: target.t
-	$(BMENU) -p "Introduction" \
+$(srcdir)/target.texi: target.t
+	$(BMENU2) -p "Introduction" \
 	    -u "Top" \
-	    -n "Makefiles" $<
+	    -n "Makefiles" < $< > $@

-makefiles.texi: makefiles.t
-	$(BMENU) -p "Target Dependent Files Board Support Package Structure" \
+$(srcdir)/makefiles.texi: makefiles.t
+	$(BMENU2) -p "Target Dependent Files Board Support Package Structure" \
 	    -u "Top" \
-	    -n "Linker Script" $<
+	    -n "Linker Script" < $< > $@

-linkcmds.texi: linkcmds.t
-	$(BMENU) -p "Makefiles Creating a New BSP Make Customization File" \
+$(srcdir)/linkcmds.texi: linkcmds.t
+	$(BMENU2) -p "Makefiles Creating a New BSP Make Customization File" \
 	    -u "Top" \
-	    -n "Ada95 Interrupt Support" $<
+	    -n "Ada95 Interrupt Support" < $< > $@

-adaintr.texi: adaintr.t
-	$(BMENU) -p "Linker Script Initialized Data" \
+$(srcdir)/adaintr.texi: adaintr.t
+	$(BMENU2) -p "Linker Script Initialized Data" \
 	    -u "Top" \
-	    -n "Miscellaneous Support Files" $<
+	    -n "Miscellaneous Support Files" < $< > $@

-support.texi: support.t
-	$(BMENU) -p "Ada95 Interrupt Support Version Requirements" \
+$(srcdir)/support.texi: support.t
+	$(BMENU2) -p "Ada95 Interrupt Support Version Requirements" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-init.texi: init.t
-	$(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" $<
-
-console.texi: console.t
-	$(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" $<
-
-clock.texi: clock.t
-	$(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" $<
-
-timer.texi: timer.t
-	$(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" $<
-
-rtc.texi: rtc.t
-	$(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" $<
-
-nvmem.texi: nvmem.t
-	$(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" $<
-#
-#  Grab the chapter on writing a network device driver.
-#
-network.texi: ../networking/driver.t
+$(srcdir)/init.texi: init.t
 	$(BMENU2) -p "" \
 	    -u "Top" \
 	    -n "" < $< > $@

-shmsupp.texi: shmsupp.t
-	$(BMENU) -p "" \
+$(srcdir)/console.texi: console.t
+	$(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-analog.texi: analog.t
-	$(BMENU) -p "" \
+$(srcdir)/clock.texi: clock.t
+	$(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-discrete.texi: discrete.t
-	$(BMENU) -p "" \
+$(srcdir)/timer.texi: timer.t
+	$(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@
+
+$(srcdir)/rtc.texi: rtc.t
+	$(BMENU2) -p "" \
+	    -u "Top" \
+	    -n "" < $< > $@
+
+$(srcdir)/nvmem.texi: nvmem.t
+	$(BMENU2) -p "" \
+	    -u "Top" \
+	    -n "" < $< > $@
+#
+#  Grab the chapter on writing a network device driver.
+#
+$(srcdir)/network.texi: ../networking/driver.t
+	$(BMENU2) -p "" \
+	    -u "Top" \
+	    -n "" < $< > $@
+
+$(srcdir)/shmsupp.texi: shmsupp.t
+	$(BMENU2) -p "" \
+	    -u "Top" \
+	    -n "" < $< > $@
+
+$(srcdir)/analog.texi: analog.t
+	$(BMENU2) -p "" \
+	    -u "Top" \
+	    -n "" < $< > $@
+
+$(srcdir)/discrete.texi: discrete.t
+	$(BMENU2) -p "" \
+	    -u "Top" \
+	    -n "" < $< > $@

 EXTRA_DIST = *.t
--- a/doc/bsp_howto/bsp_howto.texi
+++ b/doc/bsp_howto/bsp_howto.texi
@@ -19,27 +19,20 @@
@c   Master file for the Getting Started (C) Guide
@c

+@include version.texi
@include ../common/setup.texi

-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* BSP and Device Driver Development Guide (bsp_howto):
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
+@ifset use-ascii
+@dircategory RTEMS On-Line Manual
+@direntry
+* RTEMS BSP-Howto: (bsp_howto).        BSP and Device Driver Development Guide.
+@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 BSP and Device Driver Development Guide
-@subtitle Edition @value{edition}, for @value{version}
+@subtitle Edition @value{EDITION}, for @value{VERSION}
@sp 1
-@subtitle @value{update-month}
+@subtitle @value{UPDATED}
@author On-Line Applications Research Corporation
@page
@include ../common/cpright.texi
--- a/doc/bsp_howto/stamp-vti
+++ b/doc/bsp_howto/stamp-vti
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/bsp_howto/version.texi
+++ b/doc/bsp_howto/version.texi
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/common/Makefile.am
+++ b/doc/common/Makefile.am
@@ -3,6 +3,6 @@
 AUTOMAKE_OPTIONS = foreign

 EXTRA_DIST = \
-cpright.texi timemac.texi \
+cpright.texi setup.texi timemac.texi \
 timetbl.t treedef.tex wksheets.t timing.t

--- a/doc/common/setup.texi.in
+++ b/doc/common/setup.texi.in
@@ -1,75 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1999.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@c
-@c  Set Variables
-@c
-
-@set RTEMS-RELEASE @RTEMS_RELEASE@
-@set RTEMS-EDITION 1
-@set RTEMS-VERSION @RTEMS_VERSION@
-@set RTEMS-UPDATE-DATE @RTEMS_UPDATE_DATE@
-@set RTEMS-UPDATE-MONTH @RTEMS_UPDATE_MONTH@
-
-@c
-@c  The following determines which set of the tables and figures we will use.
-@c  We default to ASCII but if available TeX or HTML versions will 
-@c  be used instead.
-@c
-
-@set use-ascii
-@clear use-html
-@clear use-tex
- 
-@iftex
-@clear use-ascii
-@clear use-html
-@set use-tex
-@end iftex
- 
-@ifhtml
-@clear use-ascii
-@clear use-tex
-@set use-html
-@end ifhtml
-
-@c
-@c The following variable says to use texinfo or html for the two column
-@c texinfo tables.  For somethings the format does not look good in html.
-@c With our adjustment to the left column in TeX, it nearly always looks
-@c good printed.
-@c
-@ifset use-ascii
-@set use-texinfo-tables
-@end ifset
-@ifset use-tex
-@set use-texinfo-tables
-@end ifset
-@ifset use-html
-@clear use-texinfo-tables
-@end ifset
-
-@c
-@c Custom whitespace adjustments.  We could fiddle a bit more.
-@c
-@tex
-\global\parindent 0in
-\global\chapheadingskip = 15pt plus 4pt minus 2pt
-\global\secheadingskip = 12pt plus 4pt minus 2pt
-\global\subsecheadingskip = 9pt plus 4pt minus 2pt
-\global\hbadness = 10000
-\global\tolerance = 6000
-\global\tableindent = 1.5in
-\global\itemindent = 0.5in
-
-@ifclear smallbook
-\global\parskip 6pt plus 1pt
-@end ifclear
-@end tex
-
-
--- a/doc/configure.in
+++ b/doc/configure.in
@@ -4,19 +4,10 @@ AC_PREREQ(2.13)

 AC_INIT(project.am)

-AM_INIT_AUTOMAKE(rtemsdoc,4.5.0-beta3,no)
+RTEMS_VERSION=4.5.0-beta3

-RTEMS_VERSION="$VERSION"
-AC_SUBST(RTEMS_VERSION)
-
-RTEMS_RELEASE="4.5.0-beta3"
-AC_SUBST(RTEMS_RELEASE)
-
-RTEMS_UPDATE_DATE="May 8 2000"
-AC_SUBST(RTEMS_UPDATE_DATE)
-
-RTEMS_UPDATE_MONTH="May 2000"
-AC_SUBST(RTEMS_UPDATE_MONTH)
+AM_INIT_AUTOMAKE(rtemsdoc,${RTEMS_VERSION},no)
+AM_MAINTAINER_MODE

 AC_ARG_ENABLE(html,
 [  --disable-html           disable html support ],
@@ -126,7 +117,6 @@ rtems_support.html
 index.html
 images/Makefile
 common/Makefile
-common/setup.texi
 FAQ/Makefile
 develenv/Makefile
 user/Makefile
--- a/doc/develenv/.cvsignore
+++ b/doc/develenv/.cvsignore
@@ -15,3 +15,4 @@ develenv.toc
 develenv.tp
 develenv.vr
 index.html
+mdate-sh
--- a/doc/develenv/Makefile.am
+++ b/doc/develenv/Makefile.am
@@ -6,17 +6,16 @@
 #  $Id$
 #

-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4

-PROJECT=develenv
+PROJECT = develenv
+EDITION = 1

 include $(top_srcdir)/project.am

-COMMON_FILES = $(top_srcdir)/common/cpright.texi
-
 FILES = compile.texi direct.texi intro.texi sample.texi utils.texi

-GENERATED_FILES =
+COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi

 info_TEXINFOS = develenv.texi
-develenv_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)   
+develenv_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)
--- a/doc/develenv/develenv.texi
+++ b/doc/develenv/develenv.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 C User: (develenv).             The C User's Guide
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
+@ifset use-ascii
+@dircategory RTEMS On-Line Manual
+@direntry
+* RTEMS Development Environment Guide: (develenv).
+@end direntry
+@end ifset
+

@c variable substitution info:
@c
@@ -48,11 +47,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 +58,9 @@ END-INFO-DIR-ENTRY
@finalout

@title RTEMS Development Environment 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
@include ../common/cpright.texi
--- a/doc/develenv/stamp-vti
+++ b/doc/develenv/stamp-vti
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/develenv/version.texi
+++ b/doc/develenv/version.texi
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/filesystem/.cvsignore
+++ b/doc/filesystem/.cvsignore
@@ -20,6 +20,7 @@ fsrequirements.texi
 imfs.texi
 index.html
 init.texi
+mdate-sh
 miniimfs.texi
 mounting.texi
 patheval.texi
--- a/doc/filesystem/Makefile.am
+++ b/doc/filesystem/Makefile.am
@@ -6,63 +6,62 @@
 #  $Id$
 #

-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4

-PROJECT=filesystem
+PROJECT = filesystem
+EDITION = 1

 include $(top_srcdir)/project.am

-BMENU+= -c
+BMENU2 += -c

-COMMON_FILES=$(top_srcdir)/common/cpright.texi $(top_builddir)/common/setup.texi
+GENERATED_FILES = patheval.texi init.texi mounting.texi syscalls.texi \
+    fsrequirements.texi imfs.texi miniimfs.texi tftp.texi
+COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi

-GENERATED_FILES=patheval.texi \
-    init.texi mounting.texi syscalls.texi fsrequirements.texi imfs.texi \
-    miniimfs.texi tftp.texi
-
-FILES= preface.texi
+FILES = preface.texi

 info_TEXINFOS = filesystem.texi
 filesystem_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)

-patheval.texi: patheval.t
-	$(BMENU) -p "" \
+$(srcdir)/patheval.texi: patheval.t
+	$(BMENU2) -p "" \
 	   -u "Top" \
-	   -n "" $<
+	   -n "" < $< > $@

-init.texi: init.t
-	$(BMENU) -p "" \
+$(srcdir)/init.texi: init.t
+	$(BMENU2) -p "" \
 	   -u "Top" \
-	   -n "" $<
+	   -n "" < $< > $@

-mounting.texi: mounting.t
-	$(BMENU) -p "" \
+$(srcdir)/mounting.texi: mounting.t
+	$(BMENU2) -p "" \
 	   -u "Top" \
-	   -n "" $<
+	   -n "" < $< > $@

-syscalls.texi: syscalls.t
-	$(BMENU) -p "" \
+$(srcdir)/syscalls.texi: syscalls.t
+	$(BMENU2) -p "" \
 	   -u "Top" \
-	   -n "" $<
+	   -n "" < $< > $@

-fsrequirements.texi: fsrequirements.t
-	$(BMENU) -p "" \
+$(srcdir)/fsrequirements.texi: fsrequirements.t
+	$(BMENU2) -p "" \
 	   -u "Top" \
-	   -n "" $<
+	   -n "" < $< > $@

-imfs.texi: imfs.t
-	$(BMENU) -p "" \
+$(srcdir)/imfs.texi: imfs.t
+	$(BMENU2) -p "" \
 	   -u "Top" \
-	   -n "" $<
+	   -n "" < $< > $@

-miniimfs.texi: miniimfs.t
-	$(BMENU) -p "" \
+$(srcdir)/miniimfs.texi: miniimfs.t
+	$(BMENU2) -p "" \
 	   -u "Top" \
-	   -n "" $<
+	   -n "" < $< > $@

-tftp.texi: tftp.t
-	$(BMENU) -p "" \
+$(srcdir)/tftp.texi: tftp.t
+	$(BMENU2) -p "" \
 	   -u "Top" \
-	   -n "" $<
+	   -n "" < $< > $@

 EXTRA_DIST = *.t
--- a/doc/filesystem/filesystem.texi
+++ b/doc/filesystem/filesystem.texi
@@ -19,27 +19,20 @@
@c   Master file for the Filesystem Design Guide
@c

+@include version.texi
@include ../common/setup.texi

-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* RTEMS Filesystem Design Guide:
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
+@ifset use-ascii
+@dircategory RTEMS On-Line Manual
+@direntry
+* RTEMS Filesystem Design Guide: (filesystem).
+@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 Filesystem Design 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
@include ../common/cpright.texi
--- a/doc/filesystem/stamp-vti
+++ b/doc/filesystem/stamp-vti
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/filesystem/version.texi
+++ b/doc/filesystem/version.texi
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/index.html.in
+++ b/doc/index.html.in
@@ -1,9 +1,9 @@
 <HTML>
-<HEAD><TITLE>RTEMS @RTEMS_VERSION@ On-Line Library</TITLE></HEAD>
+<HEAD><TITLE>RTEMS @VERSION@ On-Line Library</TITLE></HEAD>
 <BODY BGCOLOR="FFFFFF">
 <A HREF="http://www.oarcorp.com" target="Text Frame">
  <IMG align=right BORDER=0 SRC="images/oaronly.jpg" ALT="OAR"> </A>
-<H1>RTEMS @RTEMS_VERSION@ On-Line Library</H1>
+<H1>RTEMS @VERSION@ On-Line Library</H1>
 <HR>
 <BODY>
 <MENU>
--- 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
--- 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

--- 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
--- a/doc/itron3.0/stamp-vti
+++ b/doc/itron3.0/stamp-vti
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/itron3.0/version.texi
+++ b/doc/itron3.0/version.texi
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/networking/.cvsignore
+++ b/doc/networking/.cvsignore
@@ -4,6 +4,7 @@ PCIreg.pdf
 decdriver.texi
 driver.texi
 index.html
+mdate-sh
 networkapp.texi
 networkflow.pdf
 networking
--- a/doc/networking/Makefile.am
+++ b/doc/networking/Makefile.am
@@ -6,21 +6,20 @@
 #  $Id$
 #

-AUTOMAKE_OPTIONS = foreign
-
-PROJECT=networking
+AUTOMAKE_OPTIONS = foreign 1.4

+PROJECT = networking
+EDITION = 1
 include $(top_srcdir)/project.am

-# FIXME: Why -c ?
-BMENU+= -c
+BMENU2 += -c

-COMMON_FILES=$(top_srcdir)/common/cpright.texi $(top_builddir)/common/setup.texi
+GENERATED_FILES = networkapp.texi driver.texi networktasks.texi testing.texi \
+    servers.texi decdriver.texi

-GENERATED_FILES=networkapp.texi driver.texi networktasks.texi testing.texi \
-  servers.texi decdriver.texi
+COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi

-FILES= networktasks.texi preface.texi
+FILES = networktasks.texi preface.texi

 info_TEXINFOS = networking.texi
 networking_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)
@@ -33,39 +32,37 @@ if USE_HTML
 html_project_DATA += networkflow.jpg networkflow.png PCIreg.jpg recvbd.jpg
 endif

-networktasks.texi: networktasks.t
-	$(BMENU) -p "Preface" \
+$(srcdir)/networktasks.texi: networktasks.t
+	$(BMENU2) -p "Preface" \
 	   -u "Top" \
-	   -n "Networking Driver" $<
+	   -n "Networking Driver" < $< > $@

-driver.texi: driver.t
-	$(BMENU) -p "Network Task Structure and Data Flow" \
+$(srcdir)/driver.texi: driver.t
+	$(BMENU2) -p "Network Task Structure and Data Flow" \
 	   -u "Top" \
-	   -n "Using Networking in an RTEMS Application" $<
+	   -n "Using Networking in an RTEMS Application" < $< > $@

-networkapp.texi: networkapp.t
-	$(BMENU) -p "Write the Driver Statistic-Printing Function" \
+$(srcdir)/networkapp.texi: networkapp.t
+	$(BMENU2) -p "Write the Driver Statistic-Printing Function" \
 	   -u "Top" \
-	   -n "Testing the Driver" $<
+	   -n "Testing the Driver" < $< > $@

-testing.texi: testing.t
-	$(BMENU) -p "Time Synchronization Using NTP" \
+$(srcdir)/testing.texi: testing.t
+	$(BMENU2) -p "Time Synchronization Using NTP" \
 	   -u "Top" \
-	   -n "Network Servers" $<
+	   -n "Network Servers" < $< > $@

-servers.texi: servers.t
-	$(BMENU) -p "Throughput" \
+$(srcdir)/servers.texi: servers.t
+	$(BMENU2) -p "Throughput" \
 	   -u "Top" \
-	   -n "DEC 21140 Driver" $<
+	   -n "DEC 21140 Driver" < $< > $@

-decdriver.texi: decdriver.t
-	$(BMENU) -p "Using Hooks" \
+$(srcdir)/decdriver.texi: decdriver.t
+	$(BMENU2) -p "Using Hooks" \
 	   -u "Top" \
-	   -n "Command and Variable Index" $<
+	   -n "Command and Variable Index" < $< > $@

-PICTURE_FILES = \
-PCIreg.eps PCIreg.jpg \
-networkflow.eps networkflow.jpg networkflow.png \
-recvbd.eps  recvbd.jpg
+PICTURE_FILES = PCIreg.eps PCIreg.jpg networkflow.eps networkflow.jpg \
+    networkflow.png recvbd.eps recvbd.jpg

 EXTRA_DIST = *.t $(PICTURE_FILES)
--- a/doc/networking/networking.texi
+++ b/doc/networking/networking.texi
@@ -19,27 +19,20 @@
@c   Master file for the network Supplement
@c

+@include version.texi
@include ../common/setup.texi

-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* RTEMS Network Supplement:
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
+@ifset use-ascii
+@dircategory RTEMS On-Line Manual
+@direntry
+* RTEMS Network Supplement: (networking).
+@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 Network 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
--- a/doc/networking/stamp-vti
+++ b/doc/networking/stamp-vti
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/networking/version.texi
+++ b/doc/networking/version.texi
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/new_chapters/.cvsignore
+++ b/doc/new_chapters/.cvsignore
@@ -7,6 +7,7 @@ dumpcontrol.texi
 error.texi
 eventlog.texi
 index.html
+mdate-sh
 monitor.texi
 new_chapters
 new_chapters*.html
--- a/doc/new_chapters/Makefile.am
+++ b/doc/new_chapters/Makefile.am
@@ -6,70 +6,69 @@
 #  $Id$
 #

-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4

-PROJECT=new_chapters
+PROJECT = new_chapters
+EDITION = 1

 include $(top_srcdir)/project.am

-COMMON_FILES=$(top_srcdir)/common/cpright.texi
+GENERATED_FILES = adminiface.texi confspace.texi dumpcontrol.texi \
+    eventlog.texi stackchk.texi rtmonuse.texi cpuuse.texi error.texi \
+    monitor.texi

-GENERATED_FILES= \
-   adminiface.texi confspace.texi \
-   dumpcontrol.texi eventlog.texi \
-   stackchk.texi rtmonuse.texi cpuuse.texi error.texi monitor.texi
+COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi

-FILES= 
+FILES =

 info_TEXINFOS = new_chapters.texi
-new_chapters_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)   
+new_chapters_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)

-eventlog.texi: eventlog.t
-	 $(BMENU) -p "" \
+$(srcdir)/eventlog.texi: eventlog.t
+	 $(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-dumpcontrol.texi: dumpcontrol.t
-	 $(BMENU) -p "" \
+$(srcdir)/dumpcontrol.texi: dumpcontrol.t
+	 $(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-confspace.texi: confspace.t
-	 $(BMENU) -p "" \
+$(srcdir)/confspace.texi: confspace.t
+	 $(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-adminiface.texi: adminiface.t
-	 $(BMENU) -p "" \
+$(srcdir)/adminiface.texi: adminiface.t
+	 $(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-stackchk.texi: stackchk.t
-	$(BMENU) -p "" \
+$(srcdir)/stackchk.texi: stackchk.t
+	$(BMENU2) -p "" \
            -u "Top" \
-            -n "" $<
+            -n "" < $< > $@

-rtmonuse.texi: rtmonuse.t
-	$(BMENU) -p "" \
+$(srcdir)/rtmonuse.texi: rtmonuse.t
+	$(BMENU2) -p "" \
            -u "Top" \
-            -n "" $<
+            -n "" < $< > $@

-cpuuse.texi: cpuuse.t
-	$(BMENU) -p "" \
+$(srcdir)/cpuuse.texi: cpuuse.t
+	$(BMENU2) -p "" \
            -u "Top" \
-            -n "" $<
+            -n "" < $< > $@

-error.texi: error.t
-	$(BMENU) -p "" \
+$(srcdir)/error.texi: error.t
+	$(BMENU2) -p "" \
            -u "Top" \
-            -n "" $<
+            -n "" < $< > $@

-monitor.texi: monitor.t
-	$(BMENU) -p "" \
+$(srcdir)/monitor.texi: monitor.t
+	$(BMENU2) -p "" \
            -u "Top" \
-            -n "" $<
+            -n "" < $< > $@

 noinst_SCRIPTS = gen_section

 EXTRA_DIST = *.t STATUS TODO $(noinst_SCRIPTS)
- 
--- a/doc/new_chapters/new_chapters.texi
+++ b/doc/new_chapters/new_chapters.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
-* New Chapters: (new_chapters).   Miscellaneous New Chapters
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
+@ifset use-ascii
+@dircategory RTEMS On-Line Manual
+@direntry
+* RTEMS New Chapters: (new_chapters).  Miscellaneous New Chapters
+@end direntry
+@end ifset

@c variable substitution info:
@c
@@ -57,11 +55,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
@@ -73,9 +66,9 @@ END-INFO-DIR-ENTRY
@finalout

@title New Chapters
-@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
--- a/doc/new_chapters/stamp-vti
+++ b/doc/new_chapters/stamp-vti
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/new_chapters/version.texi
+++ b/doc/new_chapters/version.texi
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/porting/.cvsignore
+++ b/doc/porting/.cvsignore
@@ -7,6 +7,7 @@ developtools.texi
 idlethread.texi
 index.html
 interrupts.texi
+mdate-sh
 miscellaneous.texi
 porting
 porting*.html
--- a/doc/porting/Makefile.am
+++ b/doc/porting/Makefile.am
@@ -6,73 +6,74 @@
 #  $Id$
 #

-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4

-PROJECT=porting
+PROJECT = porting
+EDITION = 1

 include $(top_srcdir)/project.am

-COMMON_FILES=$(top_srcdir)/common/cpright.texi
+FILES = preface.texi developtools.texi sourcecode.texi cpumodels.texi \
+    cpuinit.texi interrupts.texi taskcontext.texi idlethread.texi \
+    prioritybitmap.texi codetuning.texi miscellaneous.texi

-FILES=preface.texi developtools.texi sourcecode.texi cpumodels.texi \
-  cpuinit.texi interrupts.texi taskcontext.texi idlethread.texi \
-  prioritybitmap.texi codetuning.texi miscellaneous.texi $(COMMON_FILES)
+GENERATED_FILES = developtools.texi sourcecode.texi cpumodels.texi \
+    cpuinit.texi interrupts.texi taskcontext.texi idlethread.texi \
+    prioritybitmap.texi codetuning.texi miscellaneous.texi

-GENERATED_FILES=developtools.texi sourcecode.texi cpumodels.texi \
-  cpuinit.texi interrupts.texi taskcontext.texi idlethread.texi \
-  prioritybitmap.texi codetuning.texi miscellaneous.texi
+COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi

 info_TEXINFOS = porting.texi
 porting_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)

-developtools.texi: developtools.t
-	$(BMENU) -p "Preface" \
+$(srcdir)/developtools.texi: developtools.t
+	$(BMENU2) -p "Preface" \
 	    -u "Top" \
-	    -n "Source Code Organization" $<
+	    -n "Source Code Organization" < $< > $@

-sourcecode.texi: sourcecode.t
-	$(BMENU) -p "Development Tools" \
+$(srcdir)/sourcecode.texi: sourcecode.t
+	$(BMENU2) -p "Development Tools" \
 	    -u "Top" \
-	    -n "CPU Model Variations" $<
+	    -n "CPU Model Variations" < $< > $@

-cpumodels.texi: cpumodels.t
-	$(BMENU) -p "Source Code Organization Introduction" \
+$(srcdir)/cpumodels.texi: cpumodels.t
+	$(BMENU2) -p "Source Code Organization Introduction" \
 	    -u "Top" \
-	    -n "CPU Initialization" $<
+	    -n "CPU Initialization" < $< > $@

-cpuinit.texi: cpuinit.t
-	$(BMENU) -p "CPU Model Variations Coding Issues" \
+$(srcdir)/cpuinit.texi: cpuinit.t
+	$(BMENU2) -p "CPU Model Variations Coding Issues" \
 	    -u "Top" \
-	    -n "Interrupts" $<
+	    -n "Interrupts" < $< > $@

-interrupts.texi: interrupts.t
-	$(BMENU) -p "CPU Initialization Initializing the CPU" \
+$(srcdir)/interrupts.texi: interrupts.t
+	$(BMENU2) -p "CPU Initialization Initializing the CPU" \
 	    -u "Top" \
-	    -n "Task Context Management" $<
+	    -n "Task Context Management" < $< > $@

-taskcontext.texi: taskcontext.t
-	$(BMENU) -p "Interrupts Pointer to _Thread_Dispatch Routine" \
+$(srcdir)/taskcontext.texi: taskcontext.t
+	$(BMENU2) -p "Interrupts Pointer to _Thread_Dispatch Routine" \
 	    -u "Top" \
-	    -n "IDLE Thread" $<
+	    -n "IDLE Thread" < $< > $@

-idlethread.texi: idlethread.t
-	$(BMENU) -p "Task Context Management Restoring a Floating Point Context" \
+$(srcdir)/idlethread.texi: idlethread.t
+	$(BMENU2) -p "Task Context Management Restoring a Floating Point Context" \
 	    -u "Top" \
-	    -n "Priority Bitmap Manipulation" $<
+	    -n "Priority Bitmap Manipulation" < $< > $@

-prioritybitmap.texi: prioritybitmap.t
-	$(BMENU) -p "IDLE Thread Idle Thread Body" \
+$(srcdir)/prioritybitmap.texi: prioritybitmap.t
+	$(BMENU2) -p "IDLE Thread Idle Thread Body" \
 	    -u "Top" \
-	    -n "Code Tuning Parameters" $<
+	    -n "Code Tuning Parameters" < $< > $@

-codetuning.texi: codetuning.t
-	$(BMENU) -p "Priority Bitmap Manipulation Bit Scan Support" \
+$(srcdir)/codetuning.texi: codetuning.t
+	$(BMENU2) -p "Priority Bitmap Manipulation Bit Scan Support" \
 	    -u "Top" \
-	    -n "Miscellaneous" $<
+	    -n "Miscellaneous" < $< > $@

-miscellaneous.texi: miscellaneous.t
-	$(BMENU) -p "Code Tuning Parameters Partition Element Alignment" \
+$(srcdir)/miscellaneous.texi: miscellaneous.t
+	$(BMENU2) -p "Code Tuning Parameters Partition Element Alignment" \
 	    -u "Top" \
-	    -n "Command and Variable Index" $<
+	    -n "Command and Variable Index" < $< > $@

 EXTRA_DIST = *.t
--- a/doc/porting/porting.texi
+++ b/doc/porting/porting.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 Porting Guide: (porting).             The Porting Guide
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
+@ifset use-ascii
+@dircategory RTEMS On-Line Manual
+@direntry
+* RTEMS Porting Guide: (porting).      The Porting Guide
+@end direntry
+@end ifset

@c variable substitution info:
@c
@@ -55,10 +53,10 @@ 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
@@ -71,9 +69,9 @@ END-INFO-DIR-ENTRY
@finalout

@title RTEMS Porting 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
@include ../common/cpright.texi
--- a/doc/porting/stamp-vti
+++ b/doc/porting/stamp-vti
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/porting/version.texi
+++ b/doc/porting/version.texi
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/posix1003.1/.cvsignore
+++ b/doc/posix1003.1/.cvsignore
@@ -21,6 +21,7 @@ ch18.texi
 ch19.t
 ch19.texi
 index.html
+mdate-sh
 posix1003_1
 posix1003_1*.html
 posix1003_1-?
--- a/doc/posix1003.1/Makefile.am
+++ b/doc/posix1003.1/Makefile.am
@@ -6,123 +6,124 @@
 #  $Id$
 #

-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4

-PROJECT=posix1003_1
+PROJECT = posix1003_1
+EDITION = 1

 include $(top_srcdir)/project.am

-COMMON_FILES=$(top_srcdir)/common/cpright.texi $(top_builddir)/common/setup.texi
+GENERATED_FILES = ch01.texi ch02.texi ch03.texi ch04.texi ch05.texi \
+    ch06.texi ch07.texi ch08.texi ch09.texi ch10.texi ch11.texi ch12.texi \
+    ch13.texi ch14.texi ch15.texi ch16.texi ch17.texi ch18.texi ch19.t \
+    ch19.texi

-GENERATED_FILES=ch01.texi ch02.texi ch03.texi ch04.texi ch05.texi \
-                ch06.texi ch07.texi ch08.texi ch09.texi ch10.texi \
-                ch11.texi ch12.texi ch13.texi ch14.texi ch15.texi \
-                ch16.texi ch17.texi ch18.texi ch19.t ch19.texi
+COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi

-FILES= preface.texi
+FILES = preface.texi

 info_TEXINFOS = posix1003_1.texi
 posix1003_1_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)

-ch01.texi: ch01.t
-	$(BMENU) -c -p "Preface" \
+$(srcdir)/ch01.texi: ch01.t
+	$(BMENU2) -c -p "Preface" \
 	    -u "Top" \
-	    -n "Terminology and General Requirements" $<
+	    -n "Terminology and General Requirements" < $< > $@

-ch02.texi: ch02.t
-	$(BMENU) -c -p "Conformance" \
+$(srcdir)/ch02.texi: ch02.t
+	$(BMENU2) -c -p "Conformance" \
 	    -u "Top" \
-	    -n "Process Primitives" $<
+	    -n "Process Primitives" < $< > $@

-ch03.texi: ch03.t
-	$(BMENU) -c -p "Execution-Time Symbolic Constants for Portability Specifications" \
+$(srcdir)/ch03.texi: ch03.t
+	$(BMENU2) -c -p "Execution-Time Symbolic Constants for Portability Specifications" \
 	    -u "Top" \
-	    -n "Process Environment" $<
+	    -n "Process Environment" < $< > $@

-ch04.texi: ch04.t
-	$(BMENU) -c -p "Delay Process Execution" \
+$(srcdir)/ch04.texi: ch04.t
+	$(BMENU2) -c -p "Delay Process Execution" \
 	    -u "Top" \
-	    -n "Files and Directories" $<
+	    -n "Files and Directories" < $< > $@

-ch05.texi: ch05.t
-	$(BMENU) -c -p "Get Configurable System Variables" \
+$(srcdir)/ch05.texi: ch05.t
+	$(BMENU2) -c -p "Get Configurable System Variables" \
 	    -u "Top" \
-	    -n "Input and Output Primitives" $<
+	    -n "Input and Output Primitives" < $< > $@

-ch06.texi: ch06.t
-	$(BMENU) -c -p "Get Configurable Pathname Variables" \
+$(srcdir)/ch06.texi: ch06.t
+	$(BMENU2) -c -p "Get Configurable Pathname Variables" \
 	    -u "Top" \
-	    -n "Device- and Class-Specific Functions" $<
+	    -n "Device- and Class-Specific Functions" < $< > $@

-ch07.texi: ch07.t
-	$(BMENU) -c -p " Asynchronous File Synchronization" \
+$(srcdir)/ch07.texi: ch07.t
+	$(BMENU2) -c -p " Asynchronous File Synchronization" \
 	    -u "Top" \
-	    -n "Language-Specific Services for the C Programming Language" $<
+	    -n "Language-Specific Services for the C Programming Language" < $< > $@

-ch08.texi: ch08.t
-	$(BMENU) -c -p "Set Foreground Process Group ID" \
+$(srcdir)/ch08.texi: ch08.t
+	$(BMENU2) -c -p "Set Foreground Process Group ID" \
 	    -u "Top" \
-	    -n "System Databases" $<
+	    -n "System Databases" < $< > $@

-ch09.texi: ch09.t
-	$(BMENU) -c -p "Pseudo-Random Sequence Generation Functions" \
+$(srcdir)/ch09.texi: ch09.t
+	$(BMENU2) -c -p "Pseudo-Random Sequence Generation Functions" \
 	    -u "Top" \
-	    -n "Data Interchange Format" $<
+	    -n "Data Interchange Format" < $< > $@

-ch10.texi: ch10.t
-	$(BMENU) -c -p "User Database Access" \
+$(srcdir)/ch10.texi: ch10.t
+	$(BMENU2) -c -p "User Database Access" \
 	    -u "Top" \
-	    -n "Synchronization" $<
+	    -n "Synchronization" < $< > $@

-ch11.texi: ch11.t
-	$(BMENU) -c -p "Multiple Volumes" \
+$(srcdir)/ch11.texi: ch11.t
+	$(BMENU2) -c -p "Multiple Volumes" \
 	    -u "Top" \
-	    -n "Memory Management" $<
+	    -n "Memory Management" < $< > $@

-ch12.texi: ch12.t
-	$(BMENU) -c -p "Waiting on a Condition" \
+$(srcdir)/ch12.texi: ch12.t
+	$(BMENU2) -c -p "Waiting on a Condition" \
 	    -u "Top" \
-	    -n "Execution Scheduling" $<
+	    -n "Execution Scheduling" < $< > $@

-ch13.texi: ch13.t
-	$(BMENU) -c -p "Remove a Shared Memory Object" \
+$(srcdir)/ch13.texi: ch13.t
+	$(BMENU2) -c -p "Remove a Shared Memory Object" \
 	    -u "Top" \
-	    -n "Clocks and Timers" $<
+	    -n "Clocks and Timers" < $< > $@

-ch14.texi: ch14.t
-	$(BMENU) -c -p "Change the Priority Ceiling of a Mutex" \
+$(srcdir)/ch14.texi: ch14.t
+	$(BMENU2) -c -p "Change the Priority Ceiling of a Mutex" \
 	    -u "Top" \
-	    -n "Message Passing" $<
+	    -n "Message Passing" < $< > $@

-ch15.texi: ch15.t
-	$(BMENU) -c -p "High Resolution Sleep" \
+$(srcdir)/ch15.texi: ch15.t
+	$(BMENU2) -c -p "High Resolution Sleep" \
 	    -u "Top" \
-	    -n "Thread Management" $<
+	    -n "Thread Management" < $< > $@

-ch16.texi: ch16.t
-	$(BMENU) -c -p "Get Message Queue Attributes" \
+$(srcdir)/ch16.texi: ch16.t
+	$(BMENU2) -c -p "Get Message Queue Attributes" \
 	    -u "Top" \
-	    -n "Thread-Specific Data" $<
+	    -n "Thread-Specific Data" < $< > $@

-ch17.texi: ch17.t
-	$(BMENU) -c -p "Dynamic Package Initialization" \
+$(srcdir)/ch17.texi: ch17.t
+	$(BMENU2) -c -p "Dynamic Package Initialization" \
 	    -u "Top" \
-	    -n "Thread Cancellation" $<
+	    -n "Thread Cancellation" < $< > $@

-ch18.texi: ch18.t
-	$(BMENU) -c -p "Thread-Specific Data Key Deletion" \
+$(srcdir)/ch18.texi: ch18.t
+	$(BMENU2) -c -p "Thread-Specific Data Key Deletion" \
 	    -u "Top" \
-	    -n "Compliance Summary" $<
+	    -n "Compliance Summary" < $< > $@

 ch19.t: ch01.t ch02.t ch03.t ch04.t ch05.t ch06.t ch07.t ch08.t ch09.t \
-        ch10.t ch11.t ch12.t ch13.t ch14.t ch15.t ch16.t ch17.t ch18.t \
-	summarize
+    ch10.t ch11.t ch12.t ch13.t ch14.t ch15.t ch16.t ch17.t ch18.t \
+    summarize
 	./summarize >ch19.t

-ch19.texi: ch19.t
-	$(BMENU) -c -p "List of Cancellation Points" \
+$(srcdir)/ch19.texi: ch19.t
+	$(BMENU2) -c -p "List of Cancellation Points" \
 	    -u "Top" \
-	    -n "Command and Variable Index" $<
+	    -n "Command and Variable Index" < $< > $@

 noinst_SCRIPTS = summarize

--- a/doc/posix1003.1/posix1003_1.texi
+++ b/doc/posix1003.1/posix1003_1.texi
@@ -1,3 +1,4 @@
+
 \input texinfo   @c -*-texinfo-*-
@c %**start of header
@setfilename posix1003_1
@@ -19,27 +20,20 @@
@c   Master file for the POSIX 1003.1 Compliance Guide
@c

+@include version.texi
@include ../common/setup.texi

-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* RTEMS POSIX 1003.1 Compliance Guide (posix1003_1):
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
+@ifset use-ascii
+@dircategory RTEMS On-Line Manual
+@direntry
+* RTEMS POSIX 1003.1 Compliance Guide: (posix1003_1).
+@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 +45,9 @@ END-INFO-DIR-ENTRY
@finalout

@title RTEMS POSIX 1003.1 Compliance 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
@include ../common/cpright.texi
--- a/doc/posix1003.1/stamp-vti
+++ b/doc/posix1003.1/stamp-vti
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/posix1003.1/version.texi
+++ b/doc/posix1003.1/version.texi
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/posix_users/.cvsignore
+++ b/doc/posix_users/.cvsignore
@@ -11,6 +11,7 @@ io.texi
 key.texi
 libc.texi
 libm.texi
+mdate-sh
 memorymgmt.texi
 message.texi
 mutex.texi
--- a/doc/posix_users/Makefile.am
+++ b/doc/posix_users/Makefile.am
@@ -6,136 +6,134 @@
 #  $Id$
 #

-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4

-PROJECT=posix_users
+PROJECT = posix_users
+EDITION = 1

 include $(top_srcdir)/project.am

-COMMON_FILES=$(top_srcdir)/common/cpright.texi
+GENERATED_FILES = cancel.texi clock.texi cond.texi cspecific.texi \
+    device.texi files.texi io.texi key.texi memorymgmt.texi message.texi \
+    mutex.texi procenv.texi process.texi sched.texi semaphores.texi \
+    signal.texi status.texi systemdb.texi thread.texi timer.texi libc.texi \
+    libm.texi

-GENERATED_FILES= \
-   cancel.texi clock.texi cond.texi \
-   cspecific.texi device.texi files.texi \
-   io.texi key.texi memorymgmt.texi message.texi mutex.texi procenv.texi \
-   process.texi sched.texi semaphores.texi signal.texi status.texi \
-   systemdb.texi thread.texi timer.texi libc.texi libm.texi
-
-FILES= preface.texi
+COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi

+FILES = preface.texi
 info_TEXINFOS = posix_users.texi
 posix_users_TEXINFOS = $(FILES) $(GENERATED_FILES)

-process.texi: process.t
-	 $(BMENU) -p "" \
+$(srcdir)/process.texi: process.t
+	 $(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-procenv.texi: procenv.t
-	 $(BMENU) -p "" \
+$(srcdir)/procenv.texi: procenv.t
+	 $(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-files.texi: files.t
-	 $(BMENU) -p "" \
+$(srcdir)/files.texi: files.t
+	 $(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-thread.texi: thread.t
-	 $(BMENU) -p "" \
+$(srcdir)/thread.texi: thread.t
+	 $(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-signal.texi: signal.t
-	 $(BMENU) -p "" \
+$(srcdir)/signal.texi: signal.t
+	 $(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-mutex.texi: mutex.t
-	 $(BMENU) -p "" \
+$(srcdir)/mutex.texi: mutex.t
+	 $(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-cond.texi: cond.t
-	 $(BMENU) -p "" \
+$(srcdir)/cond.texi: cond.t
+	 $(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-key.texi: key.t
-	 $(BMENU) -p "" \
+$(srcdir)/key.texi: key.t
+	 $(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-clock.texi: clock.t
-	 $(BMENU) -p "" \
+$(srcdir)/clock.texi: clock.t
+	 $(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-timer.texi: timer.t
-	 $(BMENU) -p "" \
+$(srcdir)/timer.texi: timer.t
+	 $(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-sched.texi: sched.t
-	 $(BMENU) -p "" \
+$(srcdir)/sched.texi: sched.t
+	 $(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-io.texi: io.t
-	 $(BMENU) -p "" \
+$(srcdir)/io.texi: io.t
+	 $(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-device.texi: device.t
-	 $(BMENU) -p "" \
+$(srcdir)/device.texi: device.t
+	 $(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-cspecific.texi: cspecific.t
-	 $(BMENU) -p "" \
+$(srcdir)/cspecific.texi: cspecific.t
+	 $(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-semaphores.texi: semaphores.t
-	 $(BMENU) -p "" \
+$(srcdir)/semaphores.texi: semaphores.t
+	 $(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-memorymgmt.texi: memorymgmt.t
-	 $(BMENU) -p "" \
+$(srcdir)/memorymgmt.texi: memorymgmt.t
+	 $(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-message.texi: message.t
-	 $(BMENU) -p "" \
+$(srcdir)/message.texi: message.t
+	 $(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-cancel.texi: cancel.t
-	 $(BMENU) -p "" \
+$(srcdir)/cancel.texi: cancel.t
+	 $(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-systemdb.texi: systemdb.t
-	 $(BMENU) -p "" \
+$(srcdir)/systemdb.texi: systemdb.t
+	 $(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-status.texi: status.t
-	 $(BMENU) -p "" \
+$(srcdir)/status.texi: status.t
+	 $(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-libc.texi: libc.t
-	 $(BMENU) -p "" \
+$(srcdir)/libc.texi: libc.t
+	 $(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-
-libm.texi: libm.t
-	 $(BMENU) -p "" \
+$(srcdir)/libm.texi: libm.t
+	 $(BMENU2) -p "" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

 noinst_SCRIPTS = gen_size_report
 EXTRA_DIST = *.t gen_size_report
--- a/doc/posix_users/posix_users.texi
+++ b/doc/posix_users/posix_users.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 Posix API User's Guide: (posix_users).   Posix API User's Guide Plan
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
+@ifset use-ascii
+@dircategory RTEMS On-Line Manual
+@direntry
+* RTEMS Posix API User's Guide: (posix_users).
+                                       Posix API User's Guide Plan
+@end direntry
+@end ifset

@c variable substitution info:
@c
@@ -57,11 +56,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
@@ -73,9 +67,9 @@ END-INFO-DIR-ENTRY
@finalout

@title RTEMS POSIX API 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
@include ../common/cpright.texi
--- a/doc/posix_users/stamp-vti
+++ b/doc/posix_users/stamp-vti
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/posix_users/version.texi
+++ b/doc/posix_users/version.texi
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/project.am
+++ b/doc/project.am
@@ -5,6 +5,17 @@ SUFFIXES += .t
 ## Texinfo support
 TEXINFO_TEX = $(top_srcdir)/texinfo/texinfo.tex

+$(srcdir)/stamp-vti: $(PROJECT).texi $(top_srcdir)/configure.in
+	@echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh \
+	  $(srcdir)/$(PROJECT).texi`" > vti.tmp
+	@echo "@set EDITION $(EDITION)" >> vti.tmp
+	@echo "@set VERSION $(VERSION)" >> vti.tmp
+	@cmp -s vti.tmp $(srcdir)/version.texi \
+	  || (echo "Updating $(srcdir)/version.texi"; \
+	      cp vti.tmp $(srcdir)/version.texi)
+	-@rm -f vti.tmp
+	@cp $(srcdir)/version.texi $@
+
 MAINTAINERCLEANFILES += $(PROJECT) $(PROJECT)-[0-9] $(PROJECT)-[0-9][0-9]
 MAINTAINERCLEANFILES += $(GENERATED_FILES)

@@ -46,6 +57,7 @@ SUFFIXES += .html
 html_projectdir = $(htmldir)/$(PROJECT)

 TEXI2WWW_ARGS=\
+-I $(srcdir) \
 -dirfile ../index.html \
 -header $(top_builddir)/rtems_header.html \
 -footer $(top_builddir)/rtems_footer.html \
--- a/doc/relnotes/.cvsignore
+++ b/doc/relnotes/.cvsignore
@@ -1,6 +1,7 @@
 Makefile
 Makefile.in
 index.html
+mdate-sh
 relnotes
 relnotes*.html
 relnotes.aux
--- 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)
-
--- 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
--- a/doc/relnotes/stamp-vti
+++ b/doc/relnotes/stamp-vti
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/relnotes/version.texi
+++ b/doc/relnotes/version.texi
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/rgdb_specs/.cvsignore
+++ b/doc/rgdb_specs/.cvsignore
@@ -8,6 +8,7 @@ index.html
 interfacing.texi
 intro.texi
 layers.pdf
+mdate-sh
 objectives.texi
 process.pdf
 revision.texi
--- a/doc/rgdb_specs/Makefile.am
+++ b/doc/rgdb_specs/Makefile.am
@@ -6,22 +6,21 @@
 #  $Id$
 #

-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4

-PROJECT=rgdb_specs
+PROJECT = rgdb_specs
+EDITION = 1

 include $(top_srcdir)/project.am

-COMMON_FILES=$(top_srcdir)/common/cpright.texi $(top_builddir)/common/setup.texi
-
-GENERATED_FILES= \
-    intro.texi revision.texi objectives.texi gdbinternals.texi \
+GENERATED_FILES = intro.texi revision.texi objectives.texi gdbinternals.texi \
    interfacing.texi comm.texi daemon.texi conclusion.texi
+COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi

-FILES=
+FILES =

 info_TEXINFOS = rgdb_specs.texi
-rgdb_specs_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)   
+rgdb_specs_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)

 JPEG_FILES = layers.jpg process.jpg seqinit.jpg seqbreak.jpg seqdetach.jpg

@@ -35,51 +34,46 @@ endif
 #  Process Automatically Generated Files
 #

-intro.texi: intro.t
-	$(BMENU) -c -p "Top" \
+$(srcdir)/intro.texi: intro.t
+	$(BMENU2) -c -p "Top" \
 	    -u "Top" \
-	    -n "Document Revision History" $<
+	    -n "Document Revision History" < $< > $@

-revision.texi: revision.t
-	$(BMENU) -c -p "Introduction" \
+$(srcdir)/revision.texi: revision.t
+	$(BMENU2) -c -p "Introduction" \
 	    -u "Top" \
-	    -n "Objectives" $<
+	    -n "Objectives" < $< > $@

-objectives.texi: objectives.t
-	$(BMENU) -c -p "Document Revision History" \
+$(srcdir)/objectives.texi: objectives.t
+	$(BMENU2) -c -p "Document Revision History" \
 	    -u "Top" \
-	    -n "A Rapid Tour of GDB Internals" $<
+	    -n "A Rapid Tour of GDB Internals" < $< > $@

-gdbinternals.texi: gdbinternals.t
-	$(BMENU) -c -p "Implied Restrictions" \
+$(srcdir)/gdbinternals.texi: gdbinternals.t
+	$(BMENU2) -c -p "Implied Restrictions" \
 	    -u "Top" \
-	    -n "Interfacing GDB with RTEMS as a Target" $<
+	    -n "Interfacing GDB with RTEMS as a Target" < $< > $@

-interfacing.texi: interfacing.t
-	$(BMENU) -c -p "A Rapid Tour of GDB Internals" \
+$(srcdir)/interfacing.texi: interfacing.t
+	$(BMENU2) -c -p "A Rapid Tour of GDB Internals" \
 	    -u "Top" \
-	    -n "Communication with GDB" $<
+	    -n "Communication with GDB" < $< > $@

-comm.texi: comm.t
-	$(BMENU) -c -p "Interfacing GDB with RTEMS as a Target" \
+$(srcdir)/comm.texi: comm.t
+	$(BMENU2) -c -p "Interfacing GDB with RTEMS as a Target" \
 	    -u "Top" \
-	    -n "RTEMS Debugger Server Daemon" $<
+	    -n "RTEMS Debugger Server Daemon" < $< > $@

-daemon.texi: daemon.t
-	$(BMENU) -c -p "Communication with GDB" \
+$(srcdir)/daemon.texi: daemon.t
+	$(BMENU2) -c -p "Communication with GDB" \
 	    -u "Top" \
-	    -n "Conclusion" $<
+	    -n "Conclusion" < $< > $@

-conclusion.texi: conclusion.t
-	$(BMENU) -c -p "Output of a Debug Session with the Prototype" \
+$(srcdir)/conclusion.texi: conclusion.t
+	$(BMENU2) -c -p "Output of a Debug Session with the Prototype" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

-noinst_DATA = \
-layers.eps \
-process.eps \
-seqdetach.eps \
-seqbreak.eps \
-seqinit.eps
+noinst_DATA = layers.eps process.eps seqdetach.eps seqbreak.eps seqinit.eps

 EXTRA_DIST = *.t $(noinst_DATA) $(JPEG_FILES)
--- a/doc/rgdb_specs/rgdb_specs.texi
+++ b/doc/rgdb_specs/rgdb_specs.texi
@@ -19,27 +19,20 @@
@c   Master file for the Getting Started (C) Guide
@c

+@include version.texi
@include ../common/setup.texi

-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* RTEMS Remote Debugger Server Specifications (rgdb_specs):
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
+@ifset use-ascii
+@dircategory RTEMS On-Line Manual
+@direntry
+* RTEMS Remote Debugger Server Specifications: (rgdb_specs).
+@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 Remote Debugger Server Specifications
-@subtitle Edition @value{edition}, for @value{version}
+@subtitle Edition @value{EDITION}, for @value{VERSION}
@sp 1
-@subtitle @value{update-month}
+@subtitle @value{UPDATED}
@author Emmanuel Raguet and Eric Valette, Canon Research Centre
@author On-Line Applications Research Corporation
@page
--- a/doc/rgdb_specs/stamp-vti
+++ b/doc/rgdb_specs/stamp-vti
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/rgdb_specs/version.texi
+++ b/doc/rgdb_specs/version.texi
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/rtems_gdb/.cvsignore
+++ b/doc/rtems_gdb/.cvsignore
@@ -4,6 +4,7 @@ commands.texi
 example.texi
 index.html
 intro.texi
+mdate-sh
 rtems_gdb
 rtems_gdb*.html
 rtems_gdb.aux
--- a/doc/rtems_gdb/Makefile.am
+++ b/doc/rtems_gdb/Makefile.am
@@ -6,54 +6,55 @@
 #  $Id$
 #

-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4

-PROJECT=rtems_gdb
+PROJECT = rtems_gdb
+EDITION = 1

 include $(top_srcdir)/project.am

-COMMON_FILES=$(top_srcdir)/common/cpright.texi $(top_builddir)/common/setup.texi
+GENERATED_FILES = intro.texi swarch.texi started.texi commands.texi \
+    trouble.texi example.texi

-GENERATED_FILES= \
-    intro.texi swarch.texi started.texi commands.texi trouble.texi example.texi
+COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi

-FILES=
+FILES =

 info_TEXINFOS = rtems_gdb.texi
-rtems_gdb_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)   
+rtems_gdb_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)

 #
 #  Process Automatically Generated Files
 #

-intro.texi: intro.t
-	$(BMENU) -p "Top" \
+$(srcdir)/intro.texi: intro.t
+	$(BMENU2) -p "Top" \
 	    -u "Top" \
-	    -n "Software Architecture" $<
+	    -n "Software Architecture" < $< > $@

-swarch.texi: swarch.t
-	$(BMENU) -p "Introduction" \
+$(srcdir)/swarch.texi: swarch.t
+	$(BMENU2) -p "Introduction" \
 	    -u "Top" \
-	    -n "Getting Started" $<
+	    -n "Getting Started" < $< > $@

-started.texi: started.t
-	$(BMENU) -p "Software Architecture" \
+$(srcdir)/started.texi: started.t
+	$(BMENU2) -p "Software Architecture" \
 	    -u "Top" \
-	    -n "Commands" $<
+	    -n "Commands" < $< > $@

-commands.texi: commands.t
-	$(BMENU) -p "Getting Started Attaching To The System" \
+$(srcdir)/commands.texi: commands.t
+	$(BMENU2) -p "Getting Started Attaching To The System" \
 	    -u "Top" \
-	    -n "Troubleshooting" $<
+	    -n "Troubleshooting" < $< > $@

-trouble.texi: trouble.t
-	$(BMENU) -p "Commands Thread control" \
+$(srcdir)/trouble.texi: trouble.t
+	$(BMENU2) -p "Commands Thread control" \
 	    -u "Top" \
-	    -n "Debug Session Example" $<
+	    -n "Debug Session Example" < $< > $@

-example.texi: example.t
-	$(BMENU) -p "Troubleshooting Debug server not present" \
+$(srcdir)/example.texi: example.t
+	$(BMENU2) -p "Troubleshooting Debug server not present" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

 EXTRA_DIST = *.t
--- a/doc/rtems_gdb/rtems_gdb.texi
+++ b/doc/rtems_gdb/rtems_gdb.texi
@@ -19,27 +19,20 @@
@c   Master file for the Getting Started (C) Guide
@c

+@include version.texi
@include ../common/setup.texi

-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* RTEMS/GDB User's Guide (rtems_gdb):
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
+@ifset use-ascii
+@dircategory RTEMS On-Line Manual
+@direntry
+* RTEMS/GDB User's Guide: (rtems_gdb).
+@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/GDB User's Guide
-@subtitle Edition @value{edition}, for @value{version}
+@subtitle Edition @value{EDITION}, for @value{VERSION}
@sp 1
-@subtitle @value{update-month}
+@subtitle @value{UPDATED}
@author Emmanuel Raguet and Eric Valette, Canon Research Centre
@author On-Line Applications Research Corporation
@page
--- a/doc/rtems_gdb/stamp-vti
+++ b/doc/rtems_gdb/stamp-vti
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/rtems_gdb/version.texi
+++ b/doc/rtems_gdb/version.texi
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/rtems_header.html.in
+++ b/doc/rtems_header.html.in
@@ -1,5 +1,5 @@
 <BODY BGCOLOR="FFFFFF">
 <A HREF="http://www.oarcorp.com" target="Text Frame">
  <IMG align=right BORDER=0 SRC="../images/oaronly.jpg" ALT="OAR"> </A>
-<H1>RTEMS @RTEMS_VERSION@ On-Line Library</H1>
+<H1>RTEMS @VERSION@ On-Line Library</H1>
 <HR>
--- a/doc/rtems_support.html.in
+++ b/doc/rtems_support.html.in
@@ -1,5 +1,5 @@
 <HTML>
-<HEAD><TITLE>RTEMS @RTEMS_VERSION@ On-Line Library</TITLE></HEAD>
+<HEAD><TITLE>RTEMS @VERSION@ On-Line Library</TITLE></HEAD>
 <BODY BGCOLOR="FFFFFF">
 <A HREF="http://www.oarcorp.com" target="Text Frame">
  <IMG align=right BORDER=0 SRC="images/oaronly.jpg" ALT="OAR"> </A>
--- a/doc/src2html/Makefile.am
+++ b/doc/src2html/Makefile.am
@@ -16,7 +16,7 @@ PROJECT=browseable_rtems
 #
 # include $(top_srcdir)/project.am
 #
-# COMMON_FILES=../common/cpright.texi
+# COMMON_FILES=$(top_srcdir)/common/cpright.texi
 #
 #FILES= clock.texi cond.texi key.texi mutex.texi preface.texi \
 #  sched.texi signal.texi thread.texi
--- a/doc/started/.cvsignore
+++ b/doc/started/.cvsignore
@@ -6,13 +6,14 @@ buildrt.texi
 gdb.texi
 index.html
 intro.texi
+mdate-sh
 nextstep.texi
 nt.texi
 require.texi
 sample.texi
 started
-started-?
 started*.html
+started-?
 started.aux
 started.cp
 started.dvi
--- a/doc/started/Makefile.am
+++ b/doc/started/Makefile.am
@@ -6,67 +6,68 @@
 #  $Id$
 #

-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4

-PROJECT=started
+PROJECT = started
+EDITION = 1

 SUBDIRS = pictures

 include $(top_srcdir)/project.am

-COMMON_FILES=$(top_srcdir)/common/cpright.texi $(top_builddir)/common/setup.texi
-
-GENERATED_FILES= binaries.texi buildc.texi buildrt.texi gdb.texi intro.texi \
+GENERATED_FILES = binaries.texi buildc.texi buildrt.texi gdb.texi intro.texi \
    nt.texi require.texi nextstep.texi sample.texi

-FILES= tversions.texi
+COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi
+
+FILES = tversions.texi

 info_TEXINFOS = started.texi
 started_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)

-intro.texi: intro.t tversions.texi
-	$(BMENU) -c -p "Top" \
+$(srcdir)/intro.texi: intro.t tversions.texi
+	$(BMENU2) -c -p "Top" \
 	    -u "Top" \
-	    -n "Requirements" $<
+	    -n "Requirements" < $< > $@

-require.texi: require.t tversions.texi
-	$(BMENU) -c -p "GCC Mailing Lists" \
+$(srcdir)/require.texi: require.t tversions.texi
+	$(BMENU2) -c -p "GCC Mailing Lists" \
 	    -u "Top" \
-	    -n "Prebuilt Toolset Executables" $<
+	    -n "Prebuilt Toolset Executables" < $< > $@

-binaries.texi: binaries.t tversions.texi
-	$(BMENU) -c -p "GNU makeinfo Version Requirements" \
+$(srcdir)/binaries.texi: binaries.t tversions.texi
+	$(BMENU2) -c -p "GNU makeinfo Version Requirements" \
 	    -u "Top" \
-	    -n "Building the GNU C/C++ Cross Compiler Toolset" $<
+	    -n "Building the GNU C/C++ Cross Compiler Toolset" < $< > $@

-buildc.texi: buildc.t tversions.texi
-	$(BMENU) -c -p "Removing RPMs" \
+$(srcdir)/buildc.texi: buildc.t tversions.texi
+	$(BMENU2) -c -p "Removing RPMs" \
 	    -u "Top" \
-	    -n "Building RTEMS" $<
+	    -n "Building RTEMS" < $< > $@

-buildrt.texi: buildrt.t tversions.texi
-	$(BMENU) -c -p "Error Messages Indicating Configuration Problems" \
+$(srcdir)/buildrt.texi: buildrt.t tversions.texi
+	$(BMENU2) -c -p "Error Messages Indicating Configuration Problems" \
 	    -u "Top" \
-	    -n "Building the Sample Application" $<
+	    -n "Building the Sample Application" < $< > $@

-sample.texi: sample.t tversions.texi
-	$(BMENU) -c -p "Using the RTEMS configure Script Directly" \
+$(srcdir)/sample.texi: sample.t tversions.texi
+	$(BMENU2) -c -p "Using the RTEMS configure Script Directly" \
 	    -u "Top" \
-	    -n "Building the GNU Debugger" $<
+	    -n "Building the GNU Debugger" < $< > $@

 gdb.texi: gdb.t tversions.texi
-	$(BMENU) -c -p "More Information on RTEMS Application Makefiles" \
+	$(BMENU2) -c -p "More Information on RTEMS Application Makefiles" \
 	    -u "Top" \
-	    -n "Where To Go From Here" $<
+	    -n "Where To Go From Here" < $< > $@

-nextstep.texi: nextstep.t tversions.texi
-	$(BMENU) -c -p "GDB for DINK32" \
+$(srcdir)/nextstep.texi: nextstep.t tversions.texi
+	$(BMENU2) -c -p "GDB for DINK32" \
 	    -u "Top" \
-	    -n "Using MS-Windows as a Development Host" $<
+	    -n "Using MS-Windows as a Development Host" < $< > $@

-nt.texi: nt.t tversions.texi
-	$(BMENU) -c -p "Writing an Application" \
+$(srcdir)/nt.texi: nt.t tversions.texi
+	$(BMENU2) -c -p "Writing an Application" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

 EXTRA_DIST = *.t
--- a/doc/started/stamp-vti
+++ b/doc/started/stamp-vti
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/started/started.texi
+++ b/doc/started/started.texi
@@ -19,6 +19,7 @@
@c   Master file for the Getting Started (C) Guide
@c

+@include version.texi
@include ../common/setup.texi

@c
@@ -26,25 +27,17 @@
@c
@include tversions.texi

-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* Getting Started with RTEMS for C/C++ Users (started):
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
+@ifset use-ascii
+@dircategory RTEMS On-Line Manual
+@direntry
+* Getting Started with RTEMS for C/C++ Users: (started).
+@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
@@ -56,9 +49,9 @@ END-INFO-DIR-ENTRY
@finalout

@title Getting Started with RTEMS for C/C++ Users
-@subtitle Edition @value{edition}, for @value{version}
+@subtitle Edition @value{EDITION}, for @value{VERSION}
@sp 1
-@subtitle @value{update-month}
+@subtitle @value{UPDATED}
@author On-Line Applications Research Corporation
@page
@include ../common/cpright.texi
--- a/doc/started/version.texi
+++ b/doc/started/version.texi
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/started_ada/.cvsignore
+++ b/doc/started_ada/.cvsignore
@@ -5,6 +5,7 @@ buildrt.texi
 gdb.texi
 index.html
 intro.texi
+mdate-sh
 require.texi
 sample.texi
 started_ada
--- a/doc/started_ada/Makefile.am
+++ b/doc/started_ada/Makefile.am
@@ -6,54 +6,51 @@
 #  $Id$
 #

-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4

-PROJECT=started_ada
+PROJECT = started_ada
+EDITION = 1

 include $(top_srcdir)/project.am

-COMMON_FILES=$(top_srcdir)/common/cpright.texi $(top_builddir)/common/setup.texi
-
-GENERATED_FILES= buildada.texi buildrt.texi gdb.texi intro.texi \
+GENERATED_FILES = buildada.texi buildrt.texi gdb.texi intro.texi \
    require.texi sample.texi

-FILES= tversions.texi
+COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi
+
+FILES = tversions.texi

 info_TEXINFOS = started_ada.texi
 started_ada_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)

-buildrt.t: $(top_srcdir)/started/buildrt.t
-	$(LN_S) $<
-
-intro.texi: intro.t tversions.texi
-	$(BMENU) -c -p "Top" \
+$(srcdir)/intro.texi: intro.t tversions.texi
+	$(BMENU2) -c -p "Top" \
 	    -u "Top" \
-	    -n "Requirements" $<
+	    -n "Requirements" < $< > $@

-require.texi: require.t tversions.texi
-	$(BMENU) -c -p "GNAT Chat Mailing List" \
+$(srcdir)/require.texi: require.t tversions.texi
+	$(BMENU2) -c -p "GNAT Chat Mailing List" \
 	    -u "Top" \
-	    -n "Building the GNAT Cross Compiler Toolset" $<
+	    -n "Building the GNAT Cross Compiler Toolset" < $< > $@

-buildada.texi: buildada.t tversions.texi
-	$(BMENU) -c -p "Insure GCC and GNAT Environment Variables Are Not Set" \
+$(srcdir)/buildada.texi: buildada.t tversions.texi
+	$(BMENU2) -c -p "Insure GCC and GNAT Environment Variables Are Not Set" \
 	    -u "Top" \
-	    -n "Building RTEMS" $<
+	    -n "Building RTEMS" < $< > $@

-buildrt.texi: buildrt.t tversions.texi
-	$(BMENU) -c -p "Running the bit_ada Script" \
+$(srcdir)/buildrt.texi: ../started/buildrt.t tversions.texi
+	$(BMENU2) -c -p "Running the bit_ada Script" \
 	    -u "Top" \
-	    -n "Building the Sample Application" $<
+	    -n "Building the Sample Application" < $< > $@

-sample.texi: sample.t tversions.texi
-	$(BMENU) -c -p "Using the RTEMS configure Script Directly" \
+$(srcdir)/sample.texi: sample.t tversions.texi
+	$(BMENU2) -c -p "Using the RTEMS configure Script Directly" \
 	    -u "Top" \
-	    -n "Building the GNU Debugger" $<
+	    -n "Building the GNU Debugger" < $< > $@

-gdb.texi: gdb.t tversions.texi
-	$(BMENU) -c -p "Application Executable" \
+$(srcdir)/gdb.texi: gdb.t tversions.texi
+	$(BMENU2) -c -p "Application Executable" \
 	    -u "Top" \
-	    -n "" $<
+	    -n "" < $< > $@

 EXTRA_DIST = *.t
-CLEANFILES += buildrt.t
--- a/doc/started_ada/stamp-vti
+++ b/doc/started_ada/stamp-vti
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/started_ada/started_ada.texi
+++ b/doc/started_ada/started_ada.texi
@@ -19,6 +19,7 @@
@c   Master file for the Getting Started (C) Guide
@c

+@include version.texi
@include ../common/setup.texi

@c
@@ -26,25 +27,17 @@
@c
@include tversions.texi

-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* Getting Started with GNAT/RTEMS (started_ada):
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
+@ifset use-ascii
+@dircategory RTEMS On-Line Manual
+@direntry
+* Getting Started with GNAT/RTEMS: (started_ada)
+@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
@@ -56,9 +49,9 @@ END-INFO-DIR-ENTRY
@finalout

@title Getting Started with GNAT/RTEMS
-@subtitle Edition @value{edition}, for @value{version}
+@subtitle Edition @value{EDITION}, for @value{VERSION}
@sp 1
-@subtitle @value{update-month}
+@subtitle @value{UPDATED}
@author On-Line Applications Research Corporation
@page
@include ../common/cpright.texi
--- a/doc/started_ada/version.texi
+++ b/doc/started_ada/version.texi
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/supplements/hppa1_1/.cvsignore
+++ b/doc/supplements/hppa1_1/.cvsignore
@@ -6,9 +6,9 @@ cpumodel.texi
 cputable.texi
 fatalerr.texi
 hppa1_1
+hppa1_1*.html
 hppa1_1-?
 hppa1_1-??
-hppa1_1*.html
 hppa1_1.aux
 hppa1_1.cp
 hppa1_1.dvi
@@ -24,6 +24,7 @@ hppa1_1.vr
 index.html
 intr.t
 intr.texi
+mdate-sh
 memmodel.texi
 timeSIMHPPA.texi
 timing.t
--- a/doc/supplements/hppa1_1/Makefile.am
+++ b/doc/supplements/hppa1_1/Makefile.am
@@ -6,20 +6,21 @@
 #  $Id$
 #

-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4

-PROJECT=hppa1_1
+PROJECT = hppa1_1
+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 wksheets.texi timing.texi \
+    timeSIMHPPA.texi

-GENERATED_FILES=\
-  cpumodel.texi callconv.texi memmodel.texi intr.texi fatalerr.texi \
-  bsp.texi cputable.texi wksheets.texi timing.texi timeSIMHPPA.texi
+COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi

-FILES= preface.texi
+FILES = preface.texi

 info_TEXINFOS = hppa1_1.texi
 hppa1_1_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)
@@ -28,65 +29,62 @@ hppa1_1_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 CPU Model Name" \
+$(srcdir)/callconv.texi: callconv.t
+	$(BMENU2) -p "CPU Model Dependent Features CPU Model Name" \
 	    -u "Top" \
-	    -n "Memory Model" $<
+	    -n "Memory Model" < $< > $@

-memmodel.texi: memmodel.t
-	$(BMENU) -p "Calling Conventions User-Provided Routines" \
+$(srcdir)/memmodel.texi: memmodel.t
+	$(BMENU2) -p "Calling Conventions User-Provided Routines" \
 	    -u "Top" \
-	    -n "Interrupt Processing" $<
+	    -n "Interrupt Processing" < $< > $@

 # Interrupt Chapter:
 #  1.  Replace Times and Sizes
 #  2.  Build Node Structure
-intr.texi: intr_NOTIMES.t SIMHPPA_TIMES
-	${REPLACE2} -p $(srcdir)/SIMHPPA_TIMES $(srcdir)/intr_NOTIMES.t intr.t
-	$(BMENU) -p "Memory Model Flat Memory Model" \
+$(srcdir)/intr.texi: intr_NOTIMES.t SIMHPPA_TIMES
+	${REPLACE2} -p $(srcdir)/SIMHPPA_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 Disabling of Interrupts by RTEMS" \
+$(srcdir)/fatalerr.texi: fatalerr.t
+	$(BMENU2) -p "Interrupt Processing Disabling of Interrupts by RTEMS" \
 	    -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 SIMHPPA_TIMES
+$(srcdir)/wksheets.texi: $(top_srcdir)/common/wksheets.t SIMHPPA_TIMES
 	${REPLACE2} -p $(srcdir)/SIMHPPA_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 "HP-7100 Timing Data" < $< > $@
@@ -96,9 +94,9 @@ timing.texi: $(top_srcdir)/common/timing.t
 #  2.  Replace Times and Sizes
 #  3.  Build Node Structure

-timeSIMHPPA.texi: timeSIMHPPA.t
-	$(BMENU) -p "Timing Specification Terminology" \
+$(srcdir)/timeSIMHPPA.texi: timeSIMHPPA.t
+	$(BMENU2) -p "Timing Specification Terminology" \
 	    -u "Top" \
-	    -n "Command and Variable Index" $<
+	    -n "Command and Variable Index" < $< > $@

 EXTRA_DIST = SIMHPPA_TIMES *.t
--- a/doc/supplements/hppa1_1/hppa1_1.texi
+++ b/doc/supplements/hppa1_1/hppa1_1.texi
@@ -19,27 +19,20 @@
@c   Master file for the Hewlett Packard PA-RISC Applications Supplement
@c

+@include version.texi
@include ../../common/setup.texi

-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* RTEMS Hewlett Packard PA-RISC Applications Supplement (hppa1_1):
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
+@ifset use-ascii
+@dircategory RTEMS Target Supplements
+@direntry
+* RTEMS Hewlett Packard PA-RISC Applications Supplement: (hppa1_1).
+@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 Hewlett Packard PA-RISC 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
--- a/doc/supplements/hppa1_1/stamp-vti
+++ b/doc/supplements/hppa1_1/stamp-vti
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/supplements/hppa1_1/version.texi
+++ b/doc/supplements/hppa1_1/version.texi
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/supplements/i386/.cvsignore
+++ b/doc/supplements/i386/.cvsignore
@@ -24,6 +24,7 @@ i386.vr
 index.html
 intr.t
 intr.texi
+mdate-sh
 memmodel.texi
 timeFORCE386.texi
 timeFORCE386_.t
--- a/doc/supplements/i386/Makefile.am
+++ b/doc/supplements/i386/Makefile.am
@@ -6,86 +6,85 @@
 #  $Id$
 #

-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4

-PROJECT=i386
+PROJECT = i386
+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 \
+    timeFORCE386.texi

-GENERATED_FILES=\
-  cpumodel.texi callconv.texi memmodel.texi intr.texi fatalerr.texi \
-  bsp.texi cputable.texi timing.texi wksheets.texi timeFORCE386.texi
+COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi

-FILES= preface.texi
+FILES = preface.texi

 info_TEXINFOS = i386.texi
-i386_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)   
+i386_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 User-Provided Routines" \
+$(srcdir)/memmodel.texi: memmodel.t
+	$(BMENU2) -p "Calling Conventions User-Provided Routines" \
 	    -u "Top" \
-	    -n "Interrupt Processing" $<
+	    -n "Interrupt Processing" < $< > $@

 # Interrupt Chapter:
 #  1.  Replace Times and Sizes
 #  2.  Build Node Structure

-intr.texi: intr_NOTIMES.t FORCE386_TIMES
-	${REPLACE2} -p $(srcdir)/FORCE386_TIMES $(srcdir)/intr_NOTIMES.t intr.t
-	$(BMENU) -p "Memory Model Flat Memory Model" \
+$(srcdir)/intr.texi: intr_NOTIMES.t FORCE386_TIMES
+	${REPLACE2} -p $(srcdir)/FORCE386_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 FORCE386_TIMES
+$(srcdir)/wksheets.texi: $(top_srcdir)/common/wksheets.t FORCE386_TIMES
 	${REPLACE2} -p $(srcdir)/FORCE386_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 "CPU386 Timing Data" < $< > $@
@@ -95,17 +94,16 @@ timing.texi: $(top_srcdir)/common/timing.t
 #  2.  Replace Times and Sizes
 #  3.  Build Node Structure

-timeFORCE386.texi: $(top_srcdir)/common/timetbl.t timeFORCE386.t
+$(srcdir)/timeFORCE386.texi: $(top_srcdir)/common/timetbl.t timeFORCE386.t
 	cat timeFORCE386.t $(top_srcdir)/common/timetbl.t   >timeFORCE386_.t
 	@echo                                               >>timeFORCE386_.t
 	@echo "@tex"                                        >>timeFORCE386_.t
 	@echo "\\global\\advance \\smallskipamount by 4pt"  >>timeFORCE386_.t
 	@echo "@end tex"                                    >>timeFORCE386_.t
-	${REPLACE2} -p FORCE386_TIMES timeFORCE386_.t timeFORCE386_.t
-	$(BMENU) -p "Timing Specification Terminology" \
+	${REPLACE2} -p FORCE386_TIMES timeFORCE386_.t | \
+	$(BMENU2) -p "Timing Specification Terminology" \
 	    -u "Top" \
-	    -n "Command and Variable Index" timeFORCE386_.t
-	mv timeFORCE386_.texi timeFORCE386.texi
-CLEANFILES += timeFORCE386_.t timeFORCE386_.texi
+	    -n "Command and Variable Index" > $@
+CLEANFILES += timeFORCE386_.t

 EXTRA_DIST = FORCE386_TIMES *.t
--- a/doc/supplements/i386/i386.texi
+++ b/doc/supplements/i386/i386.texi
@@ -19,27 +19,20 @@
@c   Master file for the Intel i386 Applications Supplement
@c

+@include version.texi
@include ../../common/setup.texi

-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* RTEMS Intel i386 Applications Supplement (i386):
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
+@ifset use-ascii
+@dircategory RTEMS Target Supplements
+@direntry
+* RTEMS Intel i386 Applications Supplement: (i386).
+@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 i386 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
--- a/doc/supplements/i386/stamp-vti
+++ b/doc/supplements/i386/stamp-vti
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- a/doc/supplements/i386/version.texi
+++ b/doc/supplements/i386/version.texi
@@ -0,0 +1,3 @@
+@set UPDATED 1 June 2000
+@set EDITION 1
+@set VERSION 4.5.0-beta3
--- 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
--- a/Show More
+++ b/Show More