Texinfo fixups

diff --git a/ChangeLog b/ChangeLog
index 030a236409af8438478aa2a286c6e7f45a9250c4..8bc043a956a5cede05caf512311500b2c4fc283f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Tue Aug 13 17:53:58 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * texinfos.am (.texinfo.info): New target.
+       (.texinfo.dvi): New target.
+
+       From Jim Meyering:
+       * automake.in (handle_texinfo): Use `.info[-0-9]*' as pattern to
+       match info files.
+       (handle_texinfo): Handle `.texinfo' files.
+
 Mon Aug 12 10:28:46 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * automake.in (require_file_internal): Special-case `.' when

diff --git a/automake.in b/automake.in
index fac9d5cdf6ad47e8adeda71c92cc81f1408f70cf..0305feb5bd6d8e36b48bff1014ba48778b713424 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1151,7 +1151,7 @@ sub handle_texinfo
 
     foreach $info_cursor (@texis)
     {
-       ($infobase = $info_cursor) =~ s/\.texi$//;
+       ($infobase = $info_cursor) =~ s/\.texi(nfo)?$//;
 
        # If 'version.texi' is referenced by input file, then include
        # automatic versioning capability.
@@ -1209,8 +1209,7 @@ sub handle_texinfo
                          . join (' ', @texi_deps)
                          . "\n\n");
 
-       push (@infos_list, $infobase . '.info', $infobase . '.info-[0-9]',
-             $infobase . '.info-[0-9][0-9]');
+       push (@infos_list, $infobase . '.info[-0-9]*');
        push (@info_deps_list, $infobase . '.info');
        push (@dvis_list, $infobase . '.dvi');
 
@@ -1238,7 +1237,7 @@ sub handle_texinfo
                      . 'rm -f $(INFOS)' . "\n");
     &push_phony_cleaners ('info');
 
-    push (@suffixes, '.texi', '.info', '.dvi');
+    push (@suffixes, '.texi', '.texinfo', '.info', '.dvi');
 
     if (! defined $options{'no-installinfo'})
     {

diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 01bbe00ab93bb37d93921f548fbab340f3482b51..34321ac3b30de0988f5359a946beca8acf0e250f 100644 (file)
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -24,6 +24,15 @@
 .texi.dvi:
        TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $<
 
+.texinfo.info:
+## We want to force the .info file to be built in srcdir.  This is
+## probably the simplest way.
+       cd $(srcdir) \
+         && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+
+.texinfo.dvi:
+       TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $<
+
 ## Look in both . and srcdir because the info pages might have been
 ## rebuilt in the build directory.  Can't cd to srcdir; that might
 ## break a possible install-sh reference.

diff --git a/texinfos.am b/texinfos.am
index 01bbe00ab93bb37d93921f548fbab340f3482b51..34321ac3b30de0988f5359a946beca8acf0e250f 100644 (file)
--- a/texinfos.am
+++ b/texinfos.am
@@ -24,6 +24,15 @@
 .texi.dvi:
        TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $<
 
+.texinfo.info:
+## We want to force the .info file to be built in srcdir.  This is
+## probably the simplest way.
+       cd $(srcdir) \
+         && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+
+.texinfo.dvi:
+       TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $<
+
 ## Look in both . and srcdir because the info pages might have been
 ## rebuilt in the build directory.  Can't cd to srcdir; that might
 ## break a possible install-sh reference.