--- eieio/Makefile.orig	2012-04-29 11:12:37.000000000 +0200
+++ eieio/Makefile	2012-04-29 11:13:46.000000000 +0200
@@ -19,7 +19,7 @@
 ELISPPRELOAD= cedet-compat
 examples_LISP=chart.el eieio-speedbar.el linemark.el lmcompile.el
 eieio_info_TEXINFOS=eieio.texi
-MAKEINFO=makeinfo
+MAKEINFO=makeinfo --force --no-split
 test_LISP=eieio-tests.el eieio-test-methodinvoke.el eieio-perftest.el eieio-test-mro.el eieio-test-persist.el
 Misc_MISC=INSTALL ChangeLog NEWS
 VERSION=1.4
@@ -27,7 +27,7 @@
 
 
 
-all: autoloads init eieio examples eieio.info
+all: autoloads init eieio examples eieio-cedet.info
 
 .PHONY: autoloads
 autoloads: 
@@ -71,7 +71,7 @@
 	@echo "(setq debug-on-error t)" >> $@-compile-script
 	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
 
-eieio.info: $(eieio_info_TEXINFOS)
+eieio-cedet.info: $(eieio_info_TEXINFOS)
 	$(MAKEINFO) $<
 
 .PHONY: test
@@ -94,9 +94,9 @@
 
 .PHONY: dist
 
-dist: autoloads eieio.info
+dist: autoloads eieio-cedet.info
 	mkdir $(DISTDIR)
-	cp eieio-loaddefs.el $(init_LISP) $(eieio_LISP) $(examples_LISP) $(eieio_info_TEXINFOS) eieio.info* $(test_LISP) $(Misc_MISC) $(ede_FILES) $(DISTDIR)
+	cp eieio-loaddefs.el $(init_LISP) $(eieio_LISP) $(examples_LISP) $(eieio_info_TEXINFOS) eieio-cedet.info* $(test_LISP) $(Misc_MISC) $(ede_FILES) $(DISTDIR)
 
 Makefile: Project.ede
 	@echo Makefile is out of date!  It needs to be regenerated by EDE.