--- Doc/Makefile.in.orig	Tue Jul 20 08:10:07 1999
+++ Doc/Makefile.in	Tue Dec  7 16:51:36 1999
@@ -37,7 +37,7 @@
 
 @DEFS_MK@
 
-MAKEINFO = makeinfo
+MAKEINFO = makeinfo --no-split
 TEXI2DVI = texi2dvi
 DVIPS = dvips -D 300
 TEXI2HTML = texi2html -expandinfo -split_chapter
@@ -74,6 +74,7 @@
 	$(TEXI2DVI) $(sdir)/zsh.texi
 
 zsh.info: zsh.texi
+	@rm -f zsh.info*
 	$(MAKEINFO) $(sdir)/zsh.texi; exit 0
 
 zsh.texi: zsh.yo
@@ -157,10 +158,10 @@
 # ========== DEPENDENCIES FOR INSTALLING ==========
 
 # install just installs the manual pages
-install: install.man
+install: install.man install.info
 
 # uninstall just unistalls the manual pages
-uninstall: uninstall.man
+uninstall: uninstall.man uninstall.info
 
 # install man pages, creating install directory if necessary
 install.man: $(MAN)
@@ -177,7 +178,7 @@
 # install info pages, creating install directory if necessary
 install.info: zsh.info
 	$(sdir_top)/mkinstalldirs $(infodir)
-	for file in zsh.info zsh.info-[1-9]*; do \
+	for file in zsh.info; do \
 	  if test -f $$file; then \
 	    $(INSTALL_DATA) $$file $(infodir); \
 	  elif test -f $(sdir)/$$file; then \
@@ -185,9 +186,6 @@
 	  else :; \
 	   fi || exit 1; \
 	done
-	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-	  install-info --dir-file=$(infodir)/dir $(infodir)/zsh.info; \
-	else true; fi
 
 install.html: zsh_toc.html
 	$(sdir_top)/mkinstalldirs $(htmldir)
