--- ./man/emacs.texi.org	Mon Aug 19 21:15:12 1996
+++ ./man/emacs.texi	Mon Apr 14 23:08:20 1997
@@ -49,6 +49,24 @@
 @settitle GNU Emacs Manual
 @setfilename ../info/emacs
 @synindex pg cp
+@dircategory The Emacs editor and associated tools
+@direntry
+* Emacs: (emacs).	The extensible self-documenting text editor.
+* VIP: (vip).		A VI-emulation for Emacs.
+* VIPER: (viper).       The new VI-emulation mode in Emacs-19.29.
+* Forms: (forms).	Emacs package for editing data bases
+			  by filling in forms.
+* GNUS: (gnus).		The news reader GNUS.
+* MH-E: (mh-e).		Emacs interface to the MH mail system.
+* CL: (cl).		Partial Common Lisp support for Emacs Lisp.
+* SC: (sc).		Supercite lets you cite parts of messages you're 
+			  replying to, in flexible ways.
+* Dired-X: (dired-x).   Dired Extra Features.
+* Ediff: (ediff).	A comprehensive visual interface to diff & patch.
+* CC mode: (ccmode).	The GNU Emacs mode for editing C, C++, Objective-C
+			  and Java code.
+@end direntry
+
 @c
 @c in general, keep the following line commented out, unless doing a
 @c copy of this manual that will be published.  the manual should go
--- ./Makefile.in.org	Mon Aug 19 21:12:19 1996
+++ ./Makefile.in	Tue Apr 15 00:15:28 1997
@@ -184,7 +184,7 @@
 # Subdirectories to make recursively.  `lisp' is not included
 # because the compiled lisp files are part of the distribution
 # and you cannot remake them without installing Emacs first.
-SUBDIR = lib-src src
+SUBDIR = lib-src src man
 
 # The makefiles of the directories in $SUBDIR.
 SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile
@@ -368,14 +368,8 @@
 	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
 	then \
 	  (cd ${infodir};  \
-	   if [ -f dir ]; then \
-	     if [ ! -f dir.old ]; then mv -f dir dir.old; \
-	     else mv -f dir dir.bak; fi; \
-	   fi; \
 	   cd ${srcdir}/info ; \
-	   (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \
-	   (cd $${thisdir}; chmod a+r ${infodir}/dir); \
-	   for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* sc* vip*; do \
+	   for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* message* mh-e* sc* vip*; do \
 	     (cd $${thisdir}; \
 	      ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
 	      chmod a+r ${infodir}/$$f); \
@@ -426,7 +420,7 @@
 	    esac ;					\
 	  fi ;						\
 	done
-	(cd ${infodir} && rm -f cl* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*)
+	(cd ${infodir} && rm -f cl* dired-x* ediff* emacs* forms* gnus* mh-e* sc* vip*)
 	(cd ${man1dir}  && rm -f emacs.1 etags.1 ctags.1)
 	(cd ${bindir}  && rm -f emacs-${version} $(EMACS))
 
--- ./man/Makefile.in.org	Thu Jun 27 15:27:19 1996
+++ ./man/Makefile.in	Tue Apr 15 00:29:52 1997
@@ -13,7 +13,7 @@
 # The makeinfo program is part of the Texinfo distribution.
 MAKEINFO = makeinfo
 INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl ../info/dired-x \
-	       ../info/ediff ../info/forms ../info/gnus ../info/info \
+	       ../info/ediff ../info/forms ../info/gnus \
 	       ../info/mh-e ../info/sc ../info/vip ../info/viper \
 	       ../info/message
 DVI_TARGETS = emacs.dvi cc-mode.dvi cl.dvi dired-x.dvi ediff.dvi forms.dvi \
@@ -66,6 +66,7 @@
 	${srcdir}/gnu1.texi \
 	${srcdir}/glossary.texi
 
+all: info
 info: $(INFO_TARGETS)
 
 dvi: $(DVI_TARGETS)
@@ -74,12 +75,6 @@
 # in srcdir.  There is no provision for Info files
 # to exist in the build directory.
 # In a distribution of Emacs, the Info files should be up to date.
-
-../info/info: ${INFOSOURCES}
-	cd $(srcdir); $(MAKEINFO) --no-split info.texi
-
-info.dvi: ${INFOSOURCES}
-	TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/info.texi
 
 ../info/emacs: ${EMACSSOURCES}
 	cd $(srcdir); $(MAKEINFO) emacs.texi