2011-12-06 Joel Sherrill <joel.sherrill@oarcorp.com>

PR 1793/doc
	* Makefile.am, configure.ac, bmenu/bmenu2.c: Convert from texi2www to
	texi2html.
	* texi2www/ChangeLog, texi2www/Makefile.am, texi2www/dir-arrow.gif,
	texi2www/missing-arrow.gif, texi2www/next-arrow.gif,
	texi2www/prev-arrow.gif, texi2www/texi2dvi, texi2www/texi2www,
	texi2www/texi2www.texi, texi2www/up-arrow.gif: Removed.

doc/tools/ChangeLog

@@ -1,3 +1,13 @@
+2011-12-06	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	PR 1793/doc
+	* Makefile.am, configure.ac, bmenu/bmenu2.c: Convert from texi2www to
+	texi2html.
+	* texi2www/ChangeLog, texi2www/Makefile.am, texi2www/dir-arrow.gif,
+	texi2www/missing-arrow.gif, texi2www/next-arrow.gif,
+	texi2www/prev-arrow.gif, texi2www/texi2dvi, texi2www/texi2www,
+	texi2www/texi2www.texi, texi2www/up-arrow.gif: Removed.
+
 2011-02-02	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* configure.ac: Require autoconf-2.68, automake-1.11.1.

doc/tools/Makefile.am

@@ -3,4 +3,5 @@ ACLOCAL_AMFLAGS = -I ../../aclocal
 
 EXTRA_DIST = word-replace2
 
-SUBDIRS = bmenu texi2www
+SUBDIRS = bmenu
+#texi2www

doc/tools/bmenu/bmenu2.c

@@ -12,7 +12,7 @@
  *    + previous of the first node
  *    + next of the last node
  *
- *  COPYRIGHT (c) 1988-2002.
+ *  COPYRIGHT (c) 1989-2011.
  *  On-Line Applications Research Corporation (OAR).
  *  All rights reserved.
  *
@@ -777,7 +777,7 @@ void BuildTexinfoNodes( void )
 
       if ( menu_items == 0 ) {
         new_line = AllocateLine();
-        strcpy( new_line->Contents, "@ifinfo" );
+        strcpy( new_line->Contents, "" ); /* "@ifinfo" ); */
         _Chain_Insert( menu_insert_point->Node.previous, &new_line->Node );
 
         new_line = AllocateLine();
@@ -808,7 +808,7 @@ continue_menu_loop:
       _Chain_Insert( menu_insert_point->Node.previous, &new_line->Node );
 
       new_line = AllocateLine();
-      strcpy( new_line->Contents, "@end ifinfo" );
+      strcpy( new_line->Contents, "" ); /* "@end ifinfo" ); */
       _Chain_Insert( menu_insert_point->Node.previous, &new_line->Node );
     }
 

doc/tools/configure.ac

@@ -21,8 +21,8 @@ dnl Checks for typedefs, structures, and compiler characteristics.
 dnl Checks for library functions.
 AC_CHECK_FUNCS(strdup strstr)
 
+# texi2www/Makefile
 AC_CONFIG_FILES([Makefile
 bmenu/Makefile
-texi2www/Makefile
 ])
 AC_OUTPUT

doc/tools/texi2www/ChangeLog

@@ -1,27 +0,0 @@
-2006-01-20	Ralf Corsepius <ralf.corsepius@rtems.org>
-
-	* texi2www: Add provisory support for @image.
-
-2003-12-12	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
-
-	* Makefile.am: Cosmetics.
-
-2003-09-22	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
-
-	* Makefile.am: Merger from rtems-4-6-branch.
-
-2003-05-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
-
-	* texi2www: Add support for @ifnottex.
-
-2002-03-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
-
-	* Makefile.am: Remove AUTOMAKE_OPTIONS.
-
-2002-01-18	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
-
-	* Makefile.am: require automake-1.5.
-
-2000-08-10	Joel Sherrill <joel@OARcorp.com>
-
-	* ChangeLog: New file.

doc/tools/texi2www/Makefile.am

@@ -1,17 +0,0 @@
-#
-#  COPYRIGHT (c) 1988-2002.
-#  On-Line Applications Research Corporation (OAR).
-#  All rights reserved.
-#
-#  $Id$
-#
-
-noinst_SCRIPTS = texi2www texi2dvi
-
-EXTRA_DIST = $(noinst_SCRIPTS) dir-arrow.gif prev-arrow.gif \
-    missing-arrow.gif up-arrow.gif next-arrow.gif texi2www.texi
-
-PROJECT = texi2www
-
-# TEXINFO_TEX = $(top_srcdir)/../texinfo/texinfo.tex
-# info_TEXINFOS = texi2www.texi