add menu item and Makefile.in hook

diff --git a/Makefile.in b/Makefile.in
index 0da2cf14fd6cfc6ff9639d4a2a849a137269e885..3bc4e34897dd468ccef435179c8af23bc1b69f4d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -75,17 +75,18 @@ INSTALL_TARGET = install.all
 
 all:   $(ALL)
 
-info: configure.info doc.info
+info:  cfg-paper.info
        $(MAKE) subdir_do DO=info "DODIRS=$(SUBDIRS)"
 
+cfg-paper.info: cfg-paper.texi
+       $(MAKEINFO) -o cfg-paper.info $(srcdir)/cfg-paper.texi
+
 configure.info: configure.texi
        $(MAKEINFO) -o configure.info $(srcdir)/configure.texi
 
-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)"
+       $(INSTALL_DATA) cfg-paper.info $(infodir)/cfg-paper.info
        $(MAKE) dir.info install-dir.info
 
 install-dir.info:
@@ -459,7 +460,7 @@ install-bison: force
 ### gcc
 .PHONY: all-gcc just-gcc
 all-gcc: just-gcc
-just-gcc: just-libiberty just-bison force
+just-gcc: just-libiberty just-bison just-gnulib1 force
        if [ -d $(unsubdir)/gcc ] ; then \
                (cd $(unsubdir)/gcc$(subdir); \
                $(MAKE) \
@@ -741,8 +742,47 @@ install-ld: force
                true ; \
        fi
 \f
-### gnulib
-.PHONY: all-gnulib just-gnulib
+### gnulib (and gnulib1)
+.PHONY: all-gnulib just-gnulib1 just-gnulib
+just-gnulib1: all-gas all-binutils force
+       if [ -d $(unsubdir)/gnulib ] ; then \
+               (cd $(unsubdir)/gnulib$(subdir); \
+               $(MAKE) \
+                       "against=$(against)" \
+                       "AR=$(AR)" \
+                       "AR_FLAGS=$(AR_FLAGS)" \
+                       "CC=$(CC)" \
+                       "RANLIB=$(RANLIB)" \
+                       "LOADLIBES=$(LOADLIBES)" \
+                       "LDFLAGS=$(LDFLAGS)" \
+                       "BISON=$(BISON)" \
+                       "MAKEINFO=$(MAKEINFO)" \
+                       gnulib1.a) ; \
+       else \
+               true ; \
+       fi
+
+clean-gnulib1: force
+       if [ -d $(unsubdir)/gnulib ] ; then \
+               (cd $(unsubdir)/gnulib$(subdir); \
+               $(MAKE) \
+                       "against=$(against)" \
+                       "AR=$(AR)" \
+                       "AR_FLAGS=$(AR_FLAGS)" \
+                       "CC=$(CC)" \
+                       "RANLIB=$(RANLIB)" \
+                       "LOADLIBES=$(LOADLIBES)" \
+                       "LDFLAGS=$(LDFLAGS)" \
+                       "BISON=$(BISON)" \
+                       "MAKEINFO=$(MAKEINFO)" \
+                       clean-gnulib1) ; \
+       else \
+               true ; \
+       fi
+
+install-gnulib1: force
+       echo gnulib1 is a component, not an installable target
+
 all-gnulib: just-gnulib
 just-gnulib: all-gcc all-gas all-binutils force
        if [ -d $(unsubdir)/gnulib ] ; then \

diff --git a/cfg-paper.texi b/cfg-paper.texi
index a57d36dcf371b31da225b4500197e70927289d7f..7a5bf6b24ed89fc2bfb62e4aff5230510abaddde 100644 (file)
--- a/cfg-paper.texi
+++ b/cfg-paper.texi
@@ -22,6 +22,14 @@ Tools.  It also discusses common usage..
 Copyright @copyright{} 1991 Cygnus Support
 @end ifinfo
 
+@ifinfo
+@format
+START-INFO-DIR-ENTRY
+* configuration: (cfg-paper.info).     Some theory on configuring source.
+END-INFO-DIR-ENTRY
+@end format
+@end ifinfo
+
 @node top, Some Basic Terms, (dir), (dir)
 
 @ifinfo