--- ede/Makefile.orig	2007-09-06 01:48:40.000000000 +0300
+++ ede/Makefile	2007-09-06 01:48:54.000000000 +0300
@@ -19,7 +19,7 @@
 aux-lisp_LISP=autoconf-edit.el autoconf-compat.el
 misc_AUX=NEWS README TODO ede-proj-skel.el ChangeLog
 ede_info_TEXINFOS=ede.texi ede-projects.texi ede-targets.texi ede-sourcecode.texi ede-compilers.texi
-MAKEINFO=makeinfo
+MAKEINFO=makeinfo --force --no-split
 test_AUX=
 VERSION=1.0pre4
 DISTDIR=$(top)EDE-$(VERSION)
--- speedbar/Makefile.orig	2007-09-06 01:31:01.000000000 +0300
+++ speedbar/Makefile	2007-09-06 01:33:18.000000000 +0300
@@ -17,7 +17,7 @@
 EMACS=emacs
 speedbar_LISP=dframe.el speedbar.el
 info_TEXINFOS=speedbar.texi
-MAKEINFO=makeinfo
+MAKEINFO=makeinfo --force --no-split
 opt_LISP=rpm.el sb-gud.el sb-info.el sb-rmail.el sb-w3.el sb-texinfo.el bigclock.el sb-html.el sb-ant.el
 aux_AUX=INSTALL ChangeLog
 images_MISC=sb-dir-plus.xpm sb-dir-minus.xpm sb-dir.xpm sb-pg-plus.xpm sb-pg-minus.xpm sb-pg.xpm sb-mail.xpm sb-tag-plus.xpm sb-tag-minus.xpm sb-tag.xpm sb-tag-gt.xpm sb-tag-v.xpm sb-tag-type.xpm sb-image.el sb-obj.xpm sb-chk.xpm sb-objod.xpm sb-label.xpm sb-ro.xpm sb-doc.xpm sb-info.xpm sb-doc-plus.xpm sb-doc-minus.xpm sb-box.xpm sb-box-plus.xpm sb-box-minus.xpm
@@ -26,7 +26,7 @@
 
 
 
-all: autoloads init speedbar speedbar.info
+all: autoloads init speedbar speedbar-cedet.info
 
 .PHONY: autoloads
 autoloads: 
@@ -55,7 +55,7 @@
 	@echo "(setq debug-on-error t)" >> $@-compile-script
 	"$(EMACS)" -batch --no-site-file -l $@-compile-script -f batch-byte-compile $^
 
-speedbar.info: $(info_TEXINFOS)
+speedbar-cedet.info: $(info_TEXINFOS)
 	$(MAKEINFO) $<
 
 .PHONY: opt
@@ -78,9 +78,9 @@
 
 .PHONY: dist
 
-dist: autoloads speedbar.info
+dist: autoloads speedbar-cedet.info
 	mkdir $(DISTDIR)
-	cp speedbar-loaddefs.el $(init_LISP) $(speedbar_LISP) $(info_TEXINFOS) speedbar.info* $(opt_LISP) $(aux_AUX) $(images_MISC) $(ede_FILES) $(DISTDIR)
+	cp speedbar-loaddefs.el $(init_LISP) $(speedbar_LISP) $(info_TEXINFOS) speedbar-cedet.info* $(opt_LISP) $(aux_AUX) $(images_MISC) $(ede_FILES) $(DISTDIR)
 
 Makefile: Project.ede
 	@echo Makefile is out of date!  It needs to be regenerated by EDE.
diff -u speedbar/speedbar.texi.orig speedbar/speedbar.texi
--- speedbar/speedbar.texi.orig	2007-09-06 03:05:54.000000000 +0300
+++ speedbar/speedbar.texi	2007-09-06 03:09:15.000000000 +0300
@@ -20,12 +20,12 @@
 @c Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 @c Boston, MA 02110-1301, USA.
 
-@setfilename speedbar.info
-@settitle Speedbar: File/Tag summarizing utility
+@setfilename speedbar-cedet.info
+@settitle Speedbar: File/Tag summarizing utility (cedet version)
 
 @dircategory Emacs
 @direntry
-* Speedbar: (speedbar).        File/Tag summarizing utility.
+* Speedbar-cedet: (speedbar-cedet). File/Tag summarizing utility.
 @end direntry
 @ifnottex
 Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
@@ -51,14 +51,9 @@
 @end quotation
 @end ifnottex
 
-@dircategory Emacs
-@direntry
-* Speedbar: (speedbar). File/Tag summarizing utility.
-@end direntry
-
 @titlepage
 @sp 10
-@center @titlefont{Speedbar}
+@center @titlefont{Speedbar-cedet}
 @sp 2
 @center Eric Ludlam
 @vskip 0pt plus 1 fill

Diff finished.  Thu Sep  6 03:09:28 2007
--- semantic/doc/Makefile.orig	2007-09-06 03:20:16.000000000 +0300
+++ semantic/doc/Makefile	2007-09-06 03:20:39.000000000 +0300
@@ -11,7 +11,7 @@
 
 images_MISC=grammar-fw-ov.png grammar-fw-ov.txt
 semantic-grammar_TEXINFOS=grammar-fw.texi
-MAKEINFO=makeinfo
+MAKEINFO=makeinfo --force --no-split
 Documentation_TEXINFOS=semantic.texi glossary.texi overview.texi installation.texi fdl.texi internals.texi semanticheader.texi
 semantic-user_info_TEXINFOS=user-guide.texi minor-modes.texi
 semantic-appdev_info_TEXINFOS=app-dev-guide.texi tags.texi

Diff finished.  Thu Sep  6 03:20:56 2007