merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index c8ea333..4e4e85a 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-12  Mike Stump  <mrs@apple.com>
+
+       * Makefile.in (libiberty.html): Fix html generation.
+
+       * libiberty.texi (Index): Fix html generation with makeinfo by
+       renaming this node to Manual Index.
+
 2004-09-08  Adam Nemet  <anemet@lnxw.com>
 
        * vasprintf.c: Accept __va_copy in addition to va_copy.

diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 9f95c01..ffa4ba5 100644 (file)
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -258,7 +258,7 @@ libiberty.dvi : $(srcdir)/libiberty.texi $(TEXISRC)
        texi2dvi $(srcdir)/libiberty.texi
 
 libiberty.html : $(srcdir)/libiberty.texi $(TEXISRC)
-       $(MAKEINFO) --html -I$(srcdir) $(srcdir)/libiberty.texi
+       $(MAKEINFO) --no-split --html -I$(srcdir) -o $@ $<
 
 @MAINT@$(srcdir)/functions.texi : stamp-functions
 @MAINT@        @true

diff --git a/libiberty/libiberty.texi b/libiberty/libiberty.texi
index b57e3c5..aa51285 100644 (file)
--- a/libiberty/libiberty.texi
+++ b/libiberty/libiberty.texi
@@ -93,7 +93,7 @@ This edition accompanies GCC 3, September 2001.
 * Licenses::           The various licenses under which libiberty sources are
                        distributed.
 
-* Index::              Index of functions and categories.
+* Manual Index::     Index of functions and categories.
 @end menu
 
 @node Using
@@ -315,8 +315,8 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 
-@node    Index
-@unnumbered Index
+@node    Manual Index
+@unnumbered Manual Index
 
 @printindex cp