diff -Naur emacs/lispintro/Makefile.in emacs.build/lispintro/Makefile.in

--- emacs/lispintro/Makefile.in	2006-02-07 13:08:28 +0500

+++ emacs.build/lispintro/Makefile.in	2006-03-19 18:55:56 +0500

@@ -30,7 +30,7 @@

 INFO_SOURCES = ${srcdir}/emacs-lisp-intro.texi

 # The file name eintr must fit within 5 characters, to allow for

 # -NN extensions to fit into DOS 8+3 limits without clashing

-INFO_TARGETS = ${infodir}/eintr

+INFO_TARGETS = ${infodir}/eintr.info

 DVI_TARGETS = emacs-lisp-intro.dvi

 MAKEINFO = makeinfo

@@ -44,7 +44,7 @@

 dvi: $(DVI_TARGETS)

-${infodir}/eintr: ${INFO_SOURCES}

+${infodir}/eintr.info: ${INFO_SOURCES}

 	$(MAKEINFO) -o $@ $(srcdir)/emacs-lisp-intro.texi

 emacs-lisp-intro.dvi: ${INFO_SOURCES}

diff -Naur emacs/lispref/Makefile.in emacs.build/lispref/Makefile.in

--- emacs/lispref/Makefile.in	2006-02-07 13:08:29 +0500

+++ emacs.build/lispref/Makefile.in	2006-03-19 18:50:49 +0500

@@ -96,11 +96,11 @@

 .PHONY: clean

-# The info file is named `elisp'.

-info: $(infodir)/elisp

+# The info file is named `elisp.info'.

+info: $(infodir)/elisp.info

-$(infodir)/elisp: $(srcs)

-	$(MAKEINFO) -I. -I$(srcdir) $(srcdir)/elisp.texi -o $(infodir)/elisp

+$(infodir)/elisp.info: $(srcs)

+	$(MAKEINFO) -I. -I$(srcdir) $(srcdir)/elisp.texi -o $(infodir)/elisp.info

 elisp.dvi: $(srcs)

 	$(TEXI2DVI) -I $(srcdir) $(srcdir)/elisp.texi

@@ -108,8 +108,8 @@

 # This is for use in a separate distro of the Emacs Lisp manual.

 install: elisp

 	$(srcdir)/mkinstalldirs $(infodir)

-	cp elisp elisp-[1-9] elisp-[1-9][0-9] $(infodir)

-	${INSTALL_INFO} --info-dir=${infodir} ${infodir}/elisp

+	cp elisp.info elisp.info-[1-9] elisp.info-[1-9][0-9] $(infodir)

+	${INSTALL_INFO} --info-dir=${infodir} ${infodir}/elisp.info

 # This is for use in a separate distro of the Emacs Lisp manual.

 elisp: $(srcs)

diff -Naur emacs/Makefile.in emacs.build/Makefile.in

--- emacs/Makefile.in	2006-03-18 21:11:25 +0500

+++ emacs.build/Makefile.in	2006-03-19 18:54:23 +0500

@@ -503,7 +503,7 @@

 	   fi; \

 	   cd ${srcdir}/info ; \

 	   for elt in $(INFO_FILES); do \

-	      for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \

+	      for f in `ls $$elt.info $$elt.info-[1-9] $$elt.info-[1-9][0-9] 2>/dev/null`; do \

 	        ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \

 	        chmod a+r $(DESTDIR)${infodir}/$$f; \

 	      done; \

@@ -515,7 +515,7 @@

 	then \

 	  for elt in $(INFO_FILES); do \

 	    (cd $${thisdir}; \

-	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \

+	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt.info); \

 	  done; \

 	else true; fi

 	-chmod -R a+r $(DESTDIR)${datadir}/emacs ${COPYDESTS} $(DESTDIR)${infodir}