* automake.in (handle_texinfo): Add `/' to end of $conf_dir.

	* Makefile.am (AUTOMAKE_OPTIONS): Added `1.4'.

diff --git a/ChangeLog b/ChangeLog
index a2552e5452d89f6b5161e39dae4f736eeb0e9174..30efe3abbaf29873ddc155e303ed99ea702c3434 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1999-01-14  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (handle_texinfo): Add `/' to end of $conf_dir.
+
+       * Makefile.am (AUTOMAKE_OPTIONS): Added `1.4'.
+
        * texi-vers.am ($(srcdir)/stamp-@VTI@): Find @TEXI@ in srcdir.
        From Alexandre Oliva and Erez Zadok.
 

diff --git a/Makefile.am b/Makefile.am
index 4523d103b508791c6f267a27f85e8f40ed711998..3c336b3367a8dce163c14b056f49a9a67a7bafe0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to create Makefile.in
 
-AUTOMAKE_OPTIONS = gnits
+AUTOMAKE_OPTIONS = gnits 1.4
 MAINT_CHARSET = latin1
 
 ## We need `.' in SUBDIRS because we want `check' to build `.' before

diff --git a/Makefile.in b/Makefile.in
index 05ddac102eaf2a2bd44dff9aba1a468eb856adb8..e402777a6920d8c2c234b0dcafcf97d3fdc9f16d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -63,7 +63,7 @@ PERL = @PERL@
 TAR = @TAR@
 VERSION = @VERSION@
 
-AUTOMAKE_OPTIONS = gnits
+AUTOMAKE_OPTIONS = gnits 1.4
 MAINT_CHARSET = latin1
 
 SUBDIRS = . m4 tests

diff --git a/automake.in b/automake.in
index b5c8a41baafedc0bc5904aae41313c37ffb6d05d..492958ec5096b65237d0914a6b039f0910a05512 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1939,6 +1939,7 @@ sub handle_texinfo
            else
            {
                $conf_dir = $config_aux_dir;
+               $conf_dir .= '/' unless $conf_dir =~ /\/$/;
            }
            ($conf_pat = $conf_dir) =~ s/(\W)/\\$1/g;
            $output_rules .=

diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index 4523d103b508791c6f267a27f85e8f40ed711998..3c336b3367a8dce163c14b056f49a9a67a7bafe0 100644 (file)
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to create Makefile.in
 
-AUTOMAKE_OPTIONS = gnits
+AUTOMAKE_OPTIONS = gnits 1.4
 MAINT_CHARSET = latin1
 
 ## We need `.' in SUBDIRS because we want `check' to build `.' before