From: Tom Tromey <tromey@redhat.com>
Date: Sun, 10 Jan 1999 17:27:08 +0000 (+0000)
Subject: 	* automake.in (handle_texinfo): Prepend $(srcdir) to directory
X-Git-Tag: Release-1-4~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cf47ff4e4be2eb6aef7b583e94935b324be4a5a;p=thirdparty%2Fautomake.git

	* automake.in (handle_texinfo): Prepend $(srcdir) to directory
	used to find texinfo.tex.  Report from Glenn Amerine.
---

diff --git a/ChangeLog b/ChangeLog
index 75ef7ea97..a467c0506 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-01-10  Tom Tromey  <tromey@cygnus.com>
+
+	* automake.in (handle_texinfo): Prepend $(srcdir) to directory
+	used to find texinfo.tex.  Report from Glenn Amerine.
+
 1999-01-07  Tom Tromey  <tromey@cygnus.com>
 
 	Based on report from Marcus G. Daniels.  Fixes include.test.
diff --git a/automake.in b/automake.in
index d8715563b..278ba47c8 100755
--- a/automake.in
+++ b/automake.in
@@ -2000,26 +2000,32 @@ sub handle_texinfo
 
     # Handle location of texinfo.tex.
     local ($need_texi_file) = 0;
+    local ($texinfo_tex);
     if ($cygnus_mode)
     {
-	&define_variable ('TEXINFO_TEX',
-			  '$(top_srcdir)/../texinfo/texinfo.tex');
+	$texinfo_tex = '$(top_srcdir)/../texinfo/texinfo.tex';
+	&define_variable ('TEXINFO_TEX', $texinfo_tex);
+
     }
     elsif ($config_aux_dir ne '.' && $config_aux_dir ne '')
     {
-	&define_variable ('TEXINFO_TEX', $config_aux_dir . '/texinfo.tex');
+	$texinfo_tex = $config_aux_dir . '/texinfo.tex';
+	&define_variable ('TEXINFO_TEX', $texinfo_tex);
     }
     elsif (&variable_defined ('TEXINFO_TEX'))
     {
 	# The user defined TEXINFO_TEX so assume he knows what he is
 	# doing.
+	$texinfo_tex = ('$(srcdir)/'
+			. &dirname (&variable_value ('TEXINFO_TEX')));
     }
     else
     {
+	$texinfo_tex = '.';
 	$need_texi_file = 1;
     }
-    local ($xxform) = &dirname (&variable_value ('TEXINFO_TEX'));
-    $xxform =~ s/(\W)/\\$1/g;
+    local ($xxform);
+    ($xxform = $texinfo_tex) =~ s/(\W)/\\$1/g;
     $xform .= ' s/\@TEXINFODIR\@/' . $xxform . '/g;';
 
     $output_rules .= &file_contents_with_transform ($xform, 'texinfos');