added TEXINFO_TEX support

diff --git a/ChangeLog b/ChangeLog
index d4fb1c840102d1e7d3cea2a935afb232d54c6ddc..21917920fb7a6f950c1876f25209108d6bc64e5a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
+Sat Mar 22 00:06:00 1997  Tom Tromey  <tromey@cygnus.com>
+
+       * texinfos.am (.texi.dvi): Look in @TEXINFODIR@ for texinfo.tex.
+       (.texinfo.dvi): Likewise.
+
+       * automake.in (handle_texinfo): TEXINFO_TEX variable can set
+       location of texinfo.tex.
+
 Fri Mar 21 10:22:51 1997  Tom Tromey  <tromey@cygnus.com>
 
+       * texinfos.am (.texinfo.dvi): Mirror .texi.dvi.
+
        * ansi2knr.c, ansi2knr.1: New versions from L. Peter Deutsch.
 
        * scripts.am: Add @EXEEXT@ to installed scripts.

diff --git a/TODO b/TODO
index f049678b432cd7d5ca53871fa4943f4706176afe..6edc8daa1ca228c8cfc2d6b9d65a49f595e5a0a6 100644 (file)
--- a/TODO
+++ b/TODO
@@ -345,6 +345,8 @@ Document:
 
 what goes in AC_CONFIG_AUX_DIR
 
+TEXINFO_TEX
+
 SUBDIR entry must be direct subdir of this dir
 
 C++ -vs- yacc/lex

diff --git a/automake.in b/automake.in
index 07f79493539b9dcf7ca5ddaa2f5e9cdf99545b85..170650bebc1370f8ea0d42605891fae1a02120d6 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1886,6 +1886,8 @@ sub handle_texinfo
     &define_program_variable ('TEXI2DVI', 'src', 'texinfo/util',
                              'texi2dvi');
 
+    # Set transform for including texinfos.am.  First, handle --cygnus
+    # stuff.
     local ($xform);
     if ($cygnus_mode)
     {
@@ -1895,6 +1897,21 @@ sub handle_texinfo
     {
        $xform = 's/^CYGNUS.*$//; s/^NOTCYGNUS//;';
     }
+
+    # Handle location of texinfo.tex.
+    if ($cygnus_mode)
+    {
+       &define_variable ('TEXINFO_TEX',
+                         '$(top_srcdir)/../texinfo/texinfo.tex');
+    }
+    elsif (! &variable_defined ('TEXINFO_TEX'))
+    {
+       &define_variable ('TEXINFO_TEX', '$(srcdir)/texinfo.tex');
+    }
+    local ($xxform) = &dirname ($contents{'TEXINFO_TEX'});
+    $xxform =~ s/(\W)/\\$1/g;
+    $xform .= ' s/\@TEXINFODIR\@/' . $xxform . '/g;';
+
     $output_rules .= &file_contents_with_transform ($xform, 'texinfos');
     push (@phony, 'install-info-am', 'uninstall-info');
     push (@dist_targets, 'dist-info');
@@ -1933,11 +1950,11 @@ sub handle_texinfo
     &define_variable ("TEXINFOS", $contents{'info_TEXINFOS'});
 
     # Do some error checking.  Note that this file is not required
-    # when in Cygnus mode -- a bletcherous hack.
-    &require_file_with_line ('info_TEXINFOS',
-                            $cygnus_mode ? $GNU : $FOREIGN,
-                            'texinfo.tex')
-       unless defined $options{'no-texinfo.tex'};
+    # when in Cygnus mode; instead we defined TEXINFO_TEX explicitly
+    # up above.
+    &require_file_with_line ('info_TEXINFOS', $FOREIGN, 'texinfo.tex')
+       unless (defined $options{'no-texinfo.tex'}
+               || &variable_defined ('TEXINFO_TEX'));
 }
 
 # Handle any man pages.

diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 3dc254dc61eccf8ea67fd8173496c719ead8aefa..53d93bb72bf74177562aec68de0d28ff48e8ebb6 100644 (file)
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -25,7 +25,7 @@ NOTCYGNUS       && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 CYGNUS $(MAKEINFO) -I $(srcdir) $<
 
 .texi.dvi:
-       TEXINPUTS=$(srcdir):$$TEXINPUTS \
+       TEXINPUTS=@TEXINFODIR@:$$TEXINPUTS \
 ## Must set MAKEINFO like this so that version.texi will be found even
 ## if it is in srcdir.
          MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
@@ -58,7 +58,10 @@ NOTCYGNUS      && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 CYGNUS $(MAKEINFO) $<
 
 .texinfo.dvi:
-       TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $<
+       TEXINPUTS=@TEXINFODIR@:$$TEXINPUTS \
+## Must set MAKEINFO like this so that version.texi will be found even
+## if it is in srcdir.
+         MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
 
 ## The way to make PostScript, for those who want it.
 DVIPS = dvips

diff --git a/texinfos.am b/texinfos.am
index 3dc254dc61eccf8ea67fd8173496c719ead8aefa..53d93bb72bf74177562aec68de0d28ff48e8ebb6 100644 (file)
--- a/texinfos.am
+++ b/texinfos.am
@@ -25,7 +25,7 @@ NOTCYGNUS       && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 CYGNUS $(MAKEINFO) -I $(srcdir) $<
 
 .texi.dvi:
-       TEXINPUTS=$(srcdir):$$TEXINPUTS \
+       TEXINPUTS=@TEXINFODIR@:$$TEXINPUTS \
 ## Must set MAKEINFO like this so that version.texi will be found even
 ## if it is in srcdir.
          MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
@@ -58,7 +58,10 @@ NOTCYGNUS      && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 CYGNUS $(MAKEINFO) $<
 
 .texinfo.dvi:
-       TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $<
+       TEXINPUTS=@TEXINFODIR@:$$TEXINPUTS \
+## Must set MAKEINFO like this so that version.texi will be found even
+## if it is in srcdir.
+         MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
 
 ## The way to make PostScript, for those who want it.
 DVIPS = dvips