revised install for dir.info

diff --git a/ChangeLog b/ChangeLog
index 1a65ad89d0b72b39cc5917582804eedf1e8baf49..7230b4a0a6b771375f7f20f173663fbd1e1d7290 100644 (file)
--- 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 66183c7c672f8a608fb9204b5c90669ac98f5720..56765d26a651b3f73fec924e70ebcdfaf31af3a0 100644 (file)
--- 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