diff --git a/ChangeLog b/ChangeLog
index 1a65ad89d0..7230b4a0a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,15 @@
+Wed Dec 11 22:25:20 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
+
+	* Makefile.in: revised install for dir.info.
+
 Tue Dec 10 00:04:35 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
 
 	* configure.in: add decstation host makefile frag.
 
 	* Makefile.in: BISON now bison -y again.  also install-gcc on
 	  install.  clean-gdbm on clean.  infodir belongs in datadir.
+	  Make directories for info install.  Build dir.info here then
+	  install it.
 
 Mon Dec  9 16:48:33 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
 
diff --git a/Makefile.in b/Makefile.in
index 66183c7c67..56765d26a6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -75,12 +75,18 @@ INSTALL_TARGET = install.all
 
 all:	$(ALL)
 
-info: force
+info: doc.info
 	$(MAKE) subdir_do DO=info "DODIRS=$(SUBDIRS)"
 
-install-info: dir.info install-info-dirs force
+doc.info: doc.texi
+	$(MAKEINFO) -o doc.info $(srcdir)/doc.texi
+
+install-info: install-info-dirs force
 	$(MAKE) subdir_do DO=install-info "DODIRS=$(SUBDIRS)"
-#	$(MAKE) install-dir.info
+	$(MAKE) dir.info install-dir.info
+
+install-dir.info:
+	$(INSTALL_DATA) dir.info $(infodir)/dir.info
 
 # clib prms
 all.normal: all-texinfo all-bison all-byacc all-ld all-gnulib all-gdb all-make \
@@ -1425,10 +1431,9 @@ MAKEINFODIRS= \
 	$(infodir)
 
 install-info-dirs: force
-	for i in $(MAKEINFODIRS) ; do \
-		echo Making $$i... ; \
-		if [ -d $$i ] ; then true ; else mkdir $$i ; fi ; \
-	done
+	if [ -d $(prefix) ] ; then true ; else mkdir $(prefix) ; fi
+	if [ -d $(datadir) ] ; then true ; else mkdir $(datadir) ; fi
+	if [ -d $(infodir) ] ; then true ; else mkdir $(infodir) ; fi
 
 dir.info: force
 	$(srcdir)/texinfo/gen-info-dir $(infodir) > dir.info.new