Patch rtemsdoc-4.5.0-rc-3.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:

It addresses:
  * .cvsignore (only minor changes to yours, as they were pretty clean,
    most changes result from my mkcvsignore script being overly pedantic
    sorting entries alphabetically.)
  * timing.t handling and time<BSP>_.texi handling in supplements
  * network.t handling in bsp_howto
  * RTEMS_DATE and RTEMS_UPDATE handling in  configure.in. [It actually is
    a hack, as we could apply automake's version.texi handling instead - I
    know think to understand what automake does with it.]
  * avoid using temporary files; Therefore a new tool called bmenu2,
    derived from bemenu, is introduced, which reads a single file from stdin
    and writes to stdio.

  To apply:

    cd rtemsdoc
    patch -p1 < rtemsdoc-4.5.0-rc-3.diff
    cvs rm -f bsp_howto/network.t
    cvs add tools/bmenu/bmenu2.c
    ./bootstrap

  BTW: word-replace now is unused. It could be removed if you like to.

20 files changed, 257 insertions, 289 deletions

diff --git a/doc/supplements/.cvsignore b/doc/supplements/.cvsignore
index 3dda72986f..282522db03 100644
--- a/doc/supplements/.cvsignore
+++ b/doc/supplements/.cvsignore
@@ -1,2 +1,2 @@
-Makefile.in
 Makefile
+Makefile.in
diff --git a/doc/supplements/hppa1_1/.cvsignore b/doc/supplements/hppa1_1/.cvsignore
index c674881b34..c6cf96cfd9 100644
--- a/doc/supplements/hppa1_1/.cvsignore
+++ b/doc/supplements/hppa1_1/.cvsignore
@@ -1,30 +1,32 @@
-hppa1_1*.html
-Makefile.in
 Makefile
-cpumodel.texi
-callconv.texi
-memmodel.texi
-intr.t
-intr.texi
-fatalerr.texi
+Makefile.in
 bsp.texi
+callconv.texi
+cpumodel.texi
 cputable.texi
-wksheets.t
-wksheets.texi
-timing.t
-timing.texi
-timeSIMHPPA.texi
+fatalerr.texi
 hppa1_1
-hppa1_1.log
-hppa1_1.dvi
+hppa1_1-?
+hppa1_1-??
+hppa1_1*.html
 hppa1_1.aux
 hppa1_1.cp
+hppa1_1.dvi
 hppa1_1.fn
-hppa1_1.vr
-hppa1_1.tp
 hppa1_1.ky
+hppa1_1.log
+hppa1_1.pdf
 hppa1_1.pg
+hppa1_1.ps
 hppa1_1.toc
+hppa1_1.tp
+hppa1_1.vr
 index.html
-hppa1_1.pdf
-hppa1_1.ps
+intr.t
+intr.texi
+memmodel.texi
+timeSIMHPPA.texi
+timing.t
+timing.texi
+wksheets.t
+wksheets.texi
diff --git a/doc/supplements/hppa1_1/Makefile.am b/doc/supplements/hppa1_1/Makefile.am
index 6ed271e564..a493571234 100644
--- a/doc/supplements/hppa1_1/Makefile.am
+++ b/doc/supplements/hppa1_1/Makefile.am
@@ -87,11 +87,9 @@ CLEANFILES += wksheets.t
 #  3.  Build Node Structure
 
 timing.texi: $(top_srcdir)/common/timing.t
-	cp $(top_srcdir)/common/timing.t timing.t
-	$(BMENU) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \
+	$(BMENU2) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \
 	    -u "Top" \
-	    -n "HP-7100 Timing Data" timing.t
-CLEANFILES += timing.t
+	    -n "HP-7100 Timing Data" < $< > $@
 
 # Timing Data for BSP Chapter:
 #  1.  Copy the Shared File
diff --git a/doc/supplements/i386/.cvsignore b/doc/supplements/i386/.cvsignore
index 0614d9e99d..420713dc15 100644
--- a/doc/supplements/i386/.cvsignore
+++ b/doc/supplements/i386/.cvsignore
@@ -1,33 +1,33 @@
-i386*.html
-Makefile.in
 Makefile
-cpumodel.texi
-callconv.texi
-memmodel.texi
-intr.t
-intr.texi
-fatalerr.texi
+Makefile.in
 bsp.texi
+callconv.texi
+cpumodel.texi
 cputable.texi
-timing.t
-timing.texi
-wksheets.t
-wksheets.texi
-timeFORCE386_.t
+fatalerr.texi
 i386
-i386-1
-timeFORCE386.texi
-i386-2
-i386.log
-i386.dvi
+i386*.html
+i386-?
+i386-??
 i386.aux
 i386.cp
+i386.dvi
 i386.fn
-i386.vr
-i386.tp
 i386.ky
+i386.log
+i386.pdf
 i386.pg
+i386.ps
 i386.toc
-i386.pdf
+i386.tp
+i386.vr
 index.html
-i386.ps
+intr.t
+intr.texi
+memmodel.texi
+timeFORCE386.texi
+timeFORCE386_.t
+timing.t
+timing.texi
+wksheets.t
+wksheets.texi
diff --git a/doc/supplements/i386/Makefile.am b/doc/supplements/i386/Makefile.am
index 7b3d95a273..f3f16baac4 100644
--- a/doc/supplements/i386/Makefile.am
+++ b/doc/supplements/i386/Makefile.am
@@ -86,30 +86,26 @@ CLEANFILES += wksheets.t
 #  1.  Copy the Shared File
 #  3.  Build Node Structure
 timing.texi: $(top_srcdir)/common/timing.t
-	cp $(top_srcdir)/common/timing.t timing.t
-	$(BMENU) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \
+	$(BMENU2) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \
             -u "Top" \
-            -n "CPU386 Timing Data" timing.t
-CLEANFILES += timing.t
+            -n "CPU386 Timing Data" < $< > $@
 
 # Timing Data for BSP Chapter:
 #  1.  Copy the Shared File
 #  2.  Replace Times and Sizes
 #  3.  Build Node Structure
 
-timeFORCE386_.t: $(top_srcdir)/common/timetbl.t timeFORCE386.t
-	cat timeFORCE386.t $(top_srcdir)/common/timetbl.t            >timeFORCE386_.t
+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
-	${REPLACE} -p FORCE386_TIMES timeFORCE386_.t
-	mv timeFORCE386_.t.fixed timeFORCE386_.t
-
-timeFORCE386.texi: timeFORCE386_.t
+	${REPLACE2} -p FORCE386_TIMES timeFORCE386_.t timeFORCE386_.t
 	$(BMENU) -p "Timing Specification Terminology" \
 	    -u "Top" \
 	    -n "Command and Variable Index" timeFORCE386_.t
 	mv timeFORCE386_.texi timeFORCE386.texi
+CLEANFILES += timeFORCE386_.t timeFORCE386_.texi
 
 EXTRA_DIST = FORCE386_TIMES *.t
diff --git a/doc/supplements/i960/.cvsignore b/doc/supplements/i960/.cvsignore
index 479178e291..89a693dbf0 100644
--- a/doc/supplements/i960/.cvsignore
+++ b/doc/supplements/i960/.cvsignore
@@ -1,31 +1,31 @@
-i960*.html
-Makefile.in
 Makefile
-cpumodel.texi
-callconv.texi
-memmodel.texi
-intr.t
-intr.texi
-fatalerr.texi
+Makefile.in
 bsp.texi
+callconv.texi
+cpumodel.texi
 cputable.texi
-timing.t
-timing.texi
-wksheets.t
-wksheets.texi
-timeCVME961_.t
+fatalerr.texi
 i960
-i960.log
-timeCVME961.texi
-i960.dvi
+i960*.html
 i960.aux
 i960.cp
+i960.dvi
 i960.fn
-i960.vr
-i960.tp
 i960.ky
+i960.log
+i960.pdf
 i960.pg
+i960.ps
 i960.toc
-i960.pdf
+i960.tp
+i960.vr
 index.html
-i960.ps
+intr.t
+intr.texi
+memmodel.texi
+timeCVME961.texi
+timeCVME961_.t
+timing.t
+timing.texi
+wksheets.t
+wksheets.texi
diff --git a/doc/supplements/i960/Makefile.am b/doc/supplements/i960/Makefile.am
index b78decbc92..e0ecf513fa 100644
--- a/doc/supplements/i960/Makefile.am
+++ b/doc/supplements/i960/Makefile.am
@@ -87,30 +87,26 @@ CLEANFILES += wksheets.t
 #  3.  Build Node Structure
 
 timing.texi: $(top_srcdir)/common/timing.t
-	cp $(top_srcdir)/common/timing.t timing.t
-	$(BMENU) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \
+	$(BMENU2) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \
             -u "Top" \
-            -n "CVME961 Timing Data" timing.t
-CLEANFILES += timing.t
+            -n "CVME961 Timing Data" < $< > $@
 
 # Timing Data for BSP Chapter:
 #  1.  Copy the Shared File
 #  2.  Replace Times and Sizes
 #  3.  Build Node Structure
 
-timeCVME961_.t: $(top_srcdir)/common/timetbl.t timeCVME961.t
-	cat timeCVME961.t $(top_srcdir)/common/timetbl.t            >timeCVME961_.t
+timeCVME961.texi: $(top_srcdir)/common/timetbl.t timeCVME961.t
+	cat timeCVME961.t $(top_srcdir)/common/timetbl.t   >timeCVME961_.t
 	@echo                                               >>timeCVME961_.t
 	@echo "@tex"                                        >>timeCVME961_.t
 	@echo "\\global\\advance \\smallskipamount by 4pt"  >>timeCVME961_.t
 	@echo "@end tex"                                    >>timeCVME961_.t
-	${REPLACE} -p CVME961_TIMES timeCVME961_.t
-	mv timeCVME961_.t.fixed timeCVME961_.t
-
-timeCVME961.texi: timeCVME961_.t
+	${REPLACE2} -p CVME961_TIMES timeCVME961_.t timeCVME961_.t
 	$(BMENU) -p "Timing Specification Terminology" \
 	    -u "Top" \
 	    -n "Command and Variable Index" timeCVME961_.t
 	mv timeCVME961_.texi timeCVME961.texi
+CLEANFILES += timeCVME961_.t timeCVME961_.texi
 
 EXTRA_DIST = CVME961_TIMES *.t
diff --git a/doc/supplements/m68k/.cvsignore b/doc/supplements/m68k/.cvsignore
index 415717be1b..58ae87a3bb 100644
--- a/doc/supplements/m68k/.cvsignore
+++ b/doc/supplements/m68k/.cvsignore
@@ -1,33 +1,33 @@
-m68k*.html
-Makefile.in
 Makefile
-cpumodel.texi
+Makefile.in
+bsp.texi
 callconv.texi
-memmodel.texi
+cpumodel.texi
+cputable.texi
+fatalerr.texi
+index.html
 intr.t
 intr.texi
-fatalerr.texi
-bsp.texi
-cputable.texi
-timing.t
-timing.texi
-wksheets.t
-wksheets.texi
-timeMVME136_.t
 m68k
-m68k-1
-timeMVME136.texi
-m68k-2
-m68k.log
-m68k.dvi
+m68k*.html
+m68k-?
+m68k-??
 m68k.aux
 m68k.cp
+m68k.dvi
 m68k.fn
-m68k.vr
-m68k.tp
 m68k.ky
-m68k.pg
-m68k.toc
+m68k.log
 m68k.pdf
-index.html
+m68k.pg
 m68k.ps
+m68k.toc
+m68k.tp
+m68k.vr
+memmodel.texi
+timeMVME136.texi
+timeMVME136_.t
+timing.t
+timing.texi
+wksheets.t
+wksheets.texi
diff --git a/doc/supplements/m68k/Makefile.am b/doc/supplements/m68k/Makefile.am
index 447e44e6dd..dc7d8d072c 100644
--- a/doc/supplements/m68k/Makefile.am
+++ b/doc/supplements/m68k/Makefile.am
@@ -87,30 +87,26 @@ CLEANFILES += wksheets.t
 #  3.  Build Node Structure
 
 timing.texi: $(top_srcdir)/common/timing.t
-	cp $(top_srcdir)/common/timing.t timing.t
-	$(BMENU) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \
+	$(BMENU2) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \
             -u "Top" \
-            -n "MVME136 Timing Data" timing.t
-CLEANFILES += timing.t
+            -n "MVME136 Timing Data" < $< > $@
 
 # Timing Data for BSP Chapter:
 #  1.  Copy the Shared File
 #  2.  Replace Times and Sizes
 #  3.  Build Node Structure
 
-timeMVME136_.t: $(top_srcdir)/common/timetbl.t timeMVME136.t
-	cat timeMVME136.t $(top_srcdir)/common/timetbl.t             >timeMVME136_.t
+timeMVME136.texi: $(top_srcdir)/common/timetbl.t timeMVME136.t
+	cat timeMVME136.t $(top_srcdir)/common/timetbl.t   >timeMVME136_.t
 	@echo                                               >>timeMVME136_.t
 	@echo "@tex"                                        >>timeMVME136_.t
 	@echo "\\global\\advance \\smallskipamount by 4pt"  >>timeMVME136_.t
 	@echo "@end tex"                                    >>timeMVME136_.t
-	${REPLACE} -p MVME136_TIMES timeMVME136_.t
-	mv timeMVME136_.t.fixed timeMVME136_.t
-
-timeMVME136.texi: timeMVME136_.t
+	${REPLACE2} -p MVME136_TIMES timeMVME136_.t timeMVME136_.t
 	$(BMENU) -p "Timing Specification Terminology" \
 	    -u "Top" \
 	    -n "Command and Variable Index" timeMVME136_.t
 	mv timeMVME136_.texi timeMVME136.texi
+CLEANFILES += timeMVME136_.t timeMVME136_.texi
 
 EXTRA_DIST = MVME136_TIMES *.t
diff --git a/doc/supplements/mips64orion/.cvsignore b/doc/supplements/mips64orion/.cvsignore
index a96a97193c..3298e98b24 100644
--- a/doc/supplements/mips64orion/.cvsignore
+++ b/doc/supplements/mips64orion/.cvsignore
@@ -1,33 +1,33 @@
-mips64orion*.html
-Makefile.in
 Makefile
-cpumodel.texi
+Makefile.in
+bsp.texi
 callconv.texi
-memmodel.texi
+cpumodel.texi
+cputable.texi
+fatalerr.texi
+index.html
 intr.t
 intr.texi
-fatalerr.texi
-bsp.texi
-cputable.texi
-wksheets.t
-wksheets.texi
-timing.t
-timing.texi
-timeBSP_.t
+memmodel.texi
 mips64orion
-timeBSP.texi
-mips64orion-1
-mips64orion-2
-mips64orion.log
-mips64orion.dvi
+mips64orion*.html
+mips64orion-?
+mips64orion-??
 mips64orion.aux
 mips64orion.cp
+mips64orion.dvi
 mips64orion.fn
-mips64orion.vr
-mips64orion.tp
 mips64orion.ky
-mips64orion.pg
-mips64orion.toc
-index.html
+mips64orion.log
 mips64orion.pdf
+mips64orion.pg
 mips64orion.ps
+mips64orion.toc
+mips64orion.tp
+mips64orion.vr
+timeBSP.texi
+timeBSP_.t
+timing.t
+timing.texi
+wksheets.t
+wksheets.texi
diff --git a/doc/supplements/mips64orion/Makefile.am b/doc/supplements/mips64orion/Makefile.am
index cc30fbb2cc..f348e65632 100644
--- a/doc/supplements/mips64orion/Makefile.am
+++ b/doc/supplements/mips64orion/Makefile.am
@@ -85,30 +85,27 @@ CLEANFILES += wksheets.t
 #  3.  Build Node Structure
 
 timing.texi: $(top_srcdir)/common/timing.t
-	cp $(top_srcdir)/common/timing.t timing.t
-	$(BMENU) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \
+	$(BMENU2) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \
 	    -u "Top" \
-	    -n "BSP_FOR_TIMES Timing Data" timing.t
-CLEANFILES += timing.t
+	    -n "BSP_FOR_TIMES Timing Data" < $< > $@
 
 # Timing Data for BSP Chapter:
 #  1.  Copy the Shared File
 #  2.  Replace Times and Sizes
 #  3.  Build Node Structure
 
-timeBSP_.t: $(top_srcdir)/common/timetbl.t timeBSP.t
-	cat timeBSP.t $(top_srcdir)/common/timetbl.t                 >timeBSP_.t
+timeBSP.texi: $(top_srcdir)/common/timetbl.t timeBSP.t
+	cat timeBSP.t $(top_srcdir)/common/timetbl.t   >timeBSP_.t
 	@echo                                               >>timeBSP_.t
 	@echo "@tex"                                        >>timeBSP_.t
 	@echo "\\global\\advance \\smallskipamount by 4pt"  >>timeBSP_.t
 	@echo "@end tex"                                    >>timeBSP_.t
-	${REPLACE} -p BSP_TIMES timeBSP_.t
-	mv timeBSP_.t.fixed timeBSP_.t
-
-timeBSP.texi: timeBSP_.t
+	${REPLACE2} -p BSP_TIMES timeBSP_.t timeBSP_.t
 	$(BMENU) -p "Timing Specification Terminology" \
 	    -u "Top" \
 	    -n "Command and Variable Index" timeBSP_.t
 	mv timeBSP_.texi timeBSP.texi
+CLEANFILES += timeBSP_.t timeBSP_.texi
+
 
 EXTRA_DIST = BSP_TIMES *.t
diff --git a/doc/supplements/powerpc/.cvsignore b/doc/supplements/powerpc/.cvsignore
index e70daed3c8..555f15eddb 100644
--- a/doc/supplements/powerpc/.cvsignore
+++ b/doc/supplements/powerpc/.cvsignore
@@ -1,36 +1,35 @@
-powerpc*.html
-Makefile.in
 Makefile
-cpumodel.texi
+Makefile.in
+bsp.texi
 callconv.texi
-memmodel.texi
+cpumodel.texi
+cputable.texi
+fatalerr.texi
+index.html
 intr.t
 intr.texi
-fatalerr.texi
-bsp.texi
-cputable.texi
-timing.t
-timing.texi
-wksheets.t
-wksheets.texi
-timePSIM_.t
-timeDMV177_.t
-timePSIM.texi
+memmodel.texi
 powerpc
-timeDMV177.texi
-powerpc-1
-powerpc-2
-powerpc-3
-powerpc.log
-powerpc.dvi
+powerpc*.html
+powerpc-?
+powerpc-??
 powerpc.aux
 powerpc.cp
+powerpc.dvi
 powerpc.fn
-powerpc.vr
-powerpc.tp
 powerpc.ky
-powerpc.pg
-powerpc.toc
-index.html
+powerpc.log
 powerpc.pdf
+powerpc.pg
 powerpc.ps
+powerpc.toc
+powerpc.tp
+powerpc.vr
+timeDMV177.texi
+timeDMV177_.t
+timePSIM.texi
+timePSIM_.t
+timing.t
+timing.texi
+wksheets.t
+wksheets.texi
diff --git a/doc/supplements/powerpc/Makefile.am b/doc/supplements/powerpc/Makefile.am
index 40a4dc2d3c..37b6bc324b 100644
--- a/doc/supplements/powerpc/Makefile.am
+++ b/doc/supplements/powerpc/Makefile.am
@@ -85,50 +85,46 @@ CLEANFILES += wksheets.t
 #  1.  Copy the Shared File
 #  3.  Build Node Structure
 timing.texi: $(top_srcdir)/common/timing.t
-	cp $(top_srcdir)/common/timing.t timing.t
-	$(BMENU) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \
+	$(BMENU2) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \
             -u "Top" \
-            -n "PSIM Timing Data" timing.t
-CLEANFILES += timing.t
+            -n "PSIM Timing Data" < $< > $@
 
 # Timing Data for PSIM BSP Chapter:
 #  1.  Copy the Shared File
 #  2.  Replace Times and Sizes
 #  3.  Build Node Structure
 
-timePSIM_.t: $(top_srcdir)/common/timetbl.t timePSIM.t
-	cat timePSIM.t $(top_srcdir)/common/timetbl.t                >timePSIM_.t
+timePSIM.texi: $(top_srcdir)/common/timetbl.t timePSIM.t
+	cat timePSIM.t $(top_srcdir)/common/timetbl.t   >timePSIM_.t
 	@echo                                               >>timePSIM_.t
 	@echo "@tex"                                        >>timePSIM_.t
 	@echo "\\global\\advance \\smallskipamount by 4pt"  >>timePSIM_.t
 	@echo "@end tex"                                    >>timePSIM_.t
-	${REPLACE} -p PSIM_TIMES timePSIM_.t
-	mv timePSIM_.t.fixed timePSIM_.t
-
-timePSIM.texi: timePSIM_.t
+	${REPLACE2} -p PSIM_TIMES timePSIM_.t timePSIM_.t
 	$(BMENU) -p "Timing Specification Terminology" \
 	    -u "Top" \
 	    -n "DMV177 Timing Data" timePSIM_.t
 	mv timePSIM_.texi timePSIM.texi
+CLEANFILES += timePSIM_.t timePSIM_.texi
+
 
 # Timing Data for DMV177 BSP Chapter:
 #  1.  Copy the Shared File
 #  2.  Replace Times and Sizes
 #  3.  Build Node Structure
 
-timeDMV177_.t: $(top_srcdir)/common/timetbl.t timeDMV177.t
-	cat timeDMV177.t $(top_srcdir)/common/timetbl.t              >timeDMV177_.t
+timeDMV177.texi: $(top_srcdir)/common/timetbl.t timeDMV177.t
+	cat timeDMV177.t $(top_srcdir)/common/timetbl.t   >timeDMV177_.t
 	@echo                                               >>timeDMV177_.t
 	@echo "@tex"                                        >>timeDMV177_.t
 	@echo "\\global\\advance \\smallskipamount by 4pt"  >>timeDMV177_.t
 	@echo "@end tex"                                    >>timeDMV177_.t
-	${REPLACE} -p DMV177_TIMES timeDMV177_.t
-	mv timeDMV177_.t.fixed timeDMV177_.t
-
-timeDMV177.texi: timeDMV177_.t
+	${REPLACE2} -p DMV177_TIMES timeDMV177_.t timeDMV177_.t
 	$(BMENU) -p "PSIM Timing Data Rate Monotonic Manager" \
 	    -u "Top" \
 	    -n "Command and Variable Index" timeDMV177_.t
 	mv timeDMV177_.texi timeDMV177.texi
+CLEANFILES += timeDMV177_.t timeDMV177_.texi
+
 
 EXTRA_DIST = DMV177_TIMES PSIM_TIMES *.t
diff --git a/doc/supplements/sh/.cvsignore b/doc/supplements/sh/.cvsignore
index 58d16b8235..70b01913e0 100644
--- a/doc/supplements/sh/.cvsignore
+++ b/doc/supplements/sh/.cvsignore
@@ -1,33 +1,33 @@
-sh*.html
-Makefile.in
 Makefile
-cpumodel.texi
+Makefile.in
+bsp.texi
 callconv.texi
-memmodel.texi
+cpumodel.texi
+cputable.texi
+fatalerr.texi
+index.html
 intr.t
 intr.texi
-fatalerr.texi
-bsp.texi
-cputable.texi
-wksheets.t
-wksheets.texi
-timing.t
-timing.texi
-timeBSP_.t
+memmodel.texi
 sh
-sh-1
-timeBSP.texi
-sh-2
-sh.log
-sh.dvi
+sh*.html
+sh-?
+sh-??
 sh.aux
 sh.cp
+sh.dvi
 sh.fn
-sh.vr
-sh.tp
 sh.ky
-sh.pg
-sh.toc
-index.html
+sh.log
 sh.pdf
+sh.pg
 sh.ps
+sh.toc
+sh.tp
+sh.vr
+timeBSP.texi
+timeBSP_.t
+timing.t
+timing.texi
+wksheets.t
+wksheets.texi
diff --git a/doc/supplements/sh/Makefile.am b/doc/supplements/sh/Makefile.am
index f4c2226fb0..28338faaf2 100644
--- a/doc/supplements/sh/Makefile.am
+++ b/doc/supplements/sh/Makefile.am
@@ -85,30 +85,27 @@ CLEANFILES += wksheets.t
 #  3.  Build Node Structure
 
 timing.texi: $(top_srcdir)/common/timing.t
-	cp $(top_srcdir)/common/timing.t timing.t
-	$(BMENU) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \
+	$(BMENU2) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \
 	    -u "Top" \
-	    -n "BSP_FOR_TIMES Timing Data" timing.t
-CLEANFILES += timing.t
+	    -n "BSP_FOR_TIMES Timing Data" < $< > $@
 
 # Timing Data for BSP Chapter:
 #  1.  Copy the Shared File
 #  2.  Replace Times and Sizes
 #  3.  Build Node Structure
 
-timeBSP_.t: $(top_srcdir)/common/timetbl.t timeBSP.t
-	cat timeBSP.t $(top_srcdir)/common/timetbl.t                 >timeBSP_.t
+timeBSP.texi: $(top_srcdir)/common/timetbl.t timeBSP.t
+	cat timeBSP.t $(top_srcdir)/common/timetbl.t   >timeBSP_.t
 	@echo                                               >>timeBSP_.t
 	@echo "@tex"                                        >>timeBSP_.t
 	@echo "\\global\\advance \\smallskipamount by 4pt"  >>timeBSP_.t
 	@echo "@end tex"                                    >>timeBSP_.t
-	${REPLACE} -p BSP_TIMES timeBSP_.t
-	mv timeBSP_.t.fixed timeBSP_.t
-
-timeBSP.texi: timeBSP_.t
+	${REPLACE2} -p BSP_TIMES timeBSP_.t timeBSP_.t
 	$(BMENU) -p "Timing Specification Terminology" \
 	    -u "Top" \
 	    -n "Command and Variable Index" timeBSP_.t
 	mv timeBSP_.texi timeBSP.texi
+CLEANFILES += timeBSP_.t timeBSP_.texi
+
 
 EXTRA_DIST = BSP_TIMES *.t
diff --git a/doc/supplements/sparc/.cvsignore b/doc/supplements/sparc/.cvsignore
index c0887ae6cf..b49f532f76 100644
--- a/doc/supplements/sparc/.cvsignore
+++ b/doc/supplements/sparc/.cvsignore
@@ -1,33 +1,33 @@
-sparc*.html
-Makefile.in
 Makefile
-cpumodel.texi
+Makefile.in
+bsp.texi
 callconv.texi
-memmodel.texi
+cpumodel.texi
+cputable.texi
+fatalerr.texi
+index.html
 intr.t
 intr.texi
-fatalerr.texi
-bsp.texi
-cputable.texi
-timing.t
-timing.texi
-wksheets.t
-wksheets.texi
-timeERC32_.t
+memmodel.texi
 sparc
-timeERC32.texi
-sparc-1
-sparc-2
-sparc.log
-sparc.dvi
+sparc*.html
+sparc-?
+sparc-??
 sparc.aux
 sparc.cp
+sparc.dvi
 sparc.fn
-sparc.vr
-sparc.tp
 sparc.ky
+sparc.log
+sparc.pdf
 sparc.pg
-sparc.toc
 sparc.ps
-index.html
-sparc.pdf
+sparc.toc
+sparc.tp
+sparc.vr
+timeERC32.texi
+timeERC32_.t
+timing.t
+timing.texi
+wksheets.t
+wksheets.texi
diff --git a/doc/supplements/sparc/Makefile.am b/doc/supplements/sparc/Makefile.am
index 2bfc18cff4..d411f94283 100644
--- a/doc/supplements/sparc/Makefile.am
+++ b/doc/supplements/sparc/Makefile.am
@@ -86,31 +86,26 @@ CLEANFILES += wksheets.t
 #  1.  Copy the Shared File
 #  3.  Build Node Structure
 timing.texi: $(top_srcdir)/common/timing.t
-	cp $(top_srcdir)/common/timing.t timing.t
-	$(BMENU) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \
+	$(BMENU2) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \
             -u "Top" \
-            -n "ERC32 Timing Data" timing.t
-CLEANFILES += timing.t
-
+            -n "ERC32 Timing Data" < $< > $@
 
 # Timing Data for ERC32 BSP Chapter:
 #  1.  Copy the Shared File
 #  2.  Replace Times and Sizes
 #  3.  Build Node Structure
 
-timeERC32_.t: $(top_srcdir)/common/timetbl.t timeERC32.t
-	cat timeERC32.t $(top_srcdir)/common/timetbl.t               >timeERC32_.t
+timeERC32.texi: $(top_srcdir)/common/timetbl.t timeERC32.t
+	cat timeERC32.t $(top_srcdir)/common/timetbl.t   >timeERC32_.t
 	@echo                                               >>timeERC32_.t
 	@echo "@tex"                                        >>timeERC32_.t
 	@echo "\\global\\advance \\smallskipamount by 4pt"  >>timeERC32_.t
 	@echo "@end tex"                                    >>timeERC32_.t
-	${REPLACE} -p ERC32_TIMES timeERC32_.t
-	mv timeERC32_.t.fixed timeERC32_.t
-
-timeERC32.texi: timeERC32_.t
+	${REPLACE2} -p ERC32_TIMES timeERC32_.t timeERC32_.t
 	$(BMENU) -p "Timing Specification Terminology" \
 	    -u "Top" \
 	    -n "Command and Variable Index" timeERC32_.t
 	mv timeERC32_.texi timeERC32.texi
+CLEANFILES += timeERC32_.t timeERC32_.texi
 
 EXTRA_DIST = ERC32_TIMES *.t
diff --git a/doc/supplements/supplement.am b/doc/supplements/supplement.am
index ff1e7a9c88..6869e0dd0a 100644
--- a/doc/supplements/supplement.am
+++ b/doc/supplements/supplement.am
@@ -4,7 +4,8 @@
 ## Makefile fragment common to all supplements/<cpu>/Makefile.ams
 ##
 
-REPLACE = $(PERL) $(top_srcdir)/tools/word-replace
+## Unused
+## REPLACE = $(PERL) $(top_srcdir)/tools/word-replace
 REPLACE2 = $(PERL) $(top_srcdir)/tools/word-replace2
 
 MAINTAINERCLEANFILES += $(GENERATED_FILES)
diff --git a/doc/supplements/template/.cvsignore b/doc/supplements/template/.cvsignore
index 23529286ad..2354989302 100644
--- a/doc/supplements/template/.cvsignore
+++ b/doc/supplements/template/.cvsignore
@@ -1,33 +1,33 @@
-template*.html
-Makefile.in
 Makefile
-cpumodel.texi
+Makefile.in
+bsp.texi
 callconv.texi
-memmodel.texi
+cpumodel.texi
+cputable.texi
+fatalerr.texi
+index.html
 intr.t
 intr.texi
-fatalerr.texi
-bsp.texi
-cputable.texi
-wksheets.t
-wksheets.texi
-timing.t
-timing.texi
-timeBSP_.t
+memmodel.texi
 template
-timeBSP.texi
-template-1
-template-2
-template.log
-template.dvi
+template*.html
+template-?
+template-??
 template.aux
 template.cp
+template.dvi
 template.fn
-template.vr
-template.tp
 template.ky
-template.pg
-template.toc
-index.html
+template.log
 template.pdf
+template.pg
 template.ps
+template.toc
+template.tp
+template.vr
+timeBSP.texi
+timeBSP_.t
+timing.t
+timing.texi
+wksheets.t
+wksheets.texi
diff --git a/doc/supplements/template/Makefile.am b/doc/supplements/template/Makefile.am
index 1d743aa2b7..f50f7203a2 100644
--- a/doc/supplements/template/Makefile.am
+++ b/doc/supplements/template/Makefile.am
@@ -85,31 +85,26 @@ CLEANFILES += wksheets.t
 #  3.  Build Node Structure
 
 timing.texi: $(top_srcdir)/common/timing.t
-	cp $(top_srcdir)/common/timing.t timing.t
-	$(BMENU) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \
+	$(BMENU2) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \
 	    -u "Top" \
-	    -n "MYBSP Timing Data" timing.t
-CLEANFILES += timing.t
+	    -n "MYBSP Timing Data" < $< > $@
 
 # Timing Data for BSP BSP Chapter:
 #  1.  Copy the Shared File
 #  2.  Replace Times and Sizes
 #  3.  Build Node Structure
 
-timeBSP_.t: $(top_srcdir)/common/timetbl.t timeBSP.t
+timeBSP.texi: $(top_srcdir)/common/timetbl.t timeBSP.t
 	cat timeBSP.t $(top_srcdir)/common/timetbl.t      >timeBSP_.t
 	@echo                                               >>timeBSP_.t
 	@echo "@tex"                                        >>timeBSP_.t
 	@echo "\\global\\advance \\smallskipamount by 4pt"  >>timeBSP_.t
 	@echo "@end tex"                                    >>timeBSP_.t
-	${REPLACE} -p BSP_TIMES timeBSP_.t
-	mv timeBSP_.t.fixed timeBSP_.t
-MAINTAINERCLEANFILES += timeBSP_.t
-
-timeBSP.texi: timeBSP_.t
+	${REPLACE2} -p BSP_TIMES timeBSP_.t timeBSP_.t
 	$(BMENU) -p "Timing Specification Terminology" \
 	    -u "Top" \
 	    -n "Command and Variable Index" timeBSP_.t
 	mv timeBSP_.texi timeBSP.texi
+CLEANFILES += timeBSP_.t timeBSP_.texi
 
 EXTRA_DIST = BSP_TIMES *.t