This below is an ad hoc patch for the CVS version of Automake. This
fixes the bug that it installs `compile' and `depcomp' into $(srcdir)
instead of $(top_srcdir) incorrectly, but, as a side effect, the
default locations of `mdate-sh' and `texinfo.tex' are also changed to
$(top_srcdir). I don't know if that is a Right Thing, since I haven't
heard what way Tom or other Automake developers think is right.
The patch is definitely incomplete, because my version of Automake
fails in several tests (colon6.test, confh.test, confh3.test,
confh4.test, confsub.test and libobj2.test). However, it certainly
_works_ with GRUB. Even "make distcheck" succeeds.
GRUB DEVELOPERS: Please use my patch until Automake developers find
out a better solution. You can also obtain the tar ball from
<ftp://duff.kuicr.kyoto-u.ac.jp/pub/grub/automake-1.4a-for-grub.tar.gz>.
Okuji
Index: ChangeLog
===================================================================
RCS file: /cvs/automake/automake/ChangeLog,v
retrieving revision 1.872
diff -u -r1.872 ChangeLog
--- ChangeLog 2000/06/02 23:27:02 1.872
+++ ChangeLog 2000/06/19 11:23:15
@@ -1,3 +1,16 @@
+2000-06-19 OKUJI Yoshinori <[EMAIL PROTECTED]>
+
+ * automake.in (handle_texinfo): Set $conf_dir to
+ '$(top_srcdir)/' instead of '$(srcdir)/', if $config_aux_dir is
+ '.' or ''.
+ Set $texinfo_tex to '$(top_srcdir)/texinfo.tex' instead of
+ '$(srcdir)/texinfo.tex', if no conditional is true.
+ (maybe_push_required_file): Don't push $file even if $dir is
+ '.'.
+ (require_file_internal): If $dir is '.', set $fullfile to $file
+ instead of $relative_dir . "/" . $file, and set $errdir to $dir
+ instead of $relative_dir, unless $errdir.
+
2000-06-02 Morten Eriksen <[EMAIL PROTECTED]>
* depcomp: workaround for problem with SGI IRIX sed (it can only
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.786
diff -u -r1.786 automake.in
--- automake.in 2000/05/12 00:02:29 1.786
+++ automake.in 2000/06/19 11:23:16
@@ -2243,11 +2243,11 @@
&require_conf_file_with_line ('info_TEXINFOS', $FOREIGN,
'mdate-sh');
-
+
local ($conf_pat, $conf_dir);
if ($config_aux_dir eq '.' || $config_aux_dir eq '')
{
- $conf_dir = '$(srcdir)/';
+ $conf_dir = '$(top_srcdir)/';
}
else
{
@@ -2348,7 +2348,7 @@
}
else
{
- $texinfo_tex = '$(srcdir)/texinfo.tex';
+ $texinfo_tex = '$(top_srcdir)/texinfo.tex';
$need_texi_file = 1;
}
local ($xxform);
@@ -7390,8 +7390,7 @@
{
local ($dir, $file, $fullfile) = @_;
- # FIXME: Once again, special-case `.'.
- if ($dir eq $relative_dir || $dir eq '.')
+ if ($dir eq $relative_dir)
{
&push_dist_common ($file);
}
@@ -7429,8 +7428,8 @@
{
if ($dir eq '.')
{
- $fullfile = $relative_dir . "/" . $file;
- $errdir = $relative_dir unless $errdir;
+ $fullfile = $file;
+ $errdir = $dir unless $errdir;
}
else
{
