From: Tom Tromey <tromey@redhat.com>
Date: Thu, 14 Jan 1999 20:27:44 +0000 (+0000)
Subject: 	* automake.in (handle_texinfo): Add `/' to end of $conf_dir.
X-Git-Tag: v1.10.2~2759
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5f6de8b6d7c4bb561a8f659fb3691c53cbe251f0;p=platform%2Fupstream%2Fautomake.git

	* automake.in (handle_texinfo): Add `/' to end of $conf_dir.
	* Makefile.am (AUTOMAKE_OPTIONS): Added `1.4'.
---

diff --git a/ChangeLog b/ChangeLog
index a2552e5..30efe3a 100644
--- 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 4523d10..3c336b3 100644
--- 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 05ddac1..e402777 100644
--- 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 b5c8a41..492958e 100755
--- 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 4523d10..3c336b3 100644
--- 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