[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
1.6.2: patch-other-inputs
From: |
hstenn |
Subject: |
1.6.2: patch-other-inputs |
Date: |
Tue, 30 Jul 2002 22:55:44 GMT |
--- automake.in- Mon Jun 10 10:19:07 2002
+++ automake.in Thu Jul 4 01:32:27 2002
@@ -358,6 +358,7 @@
# List of files in AC_CONFIG_FILES/AC_OUTPUT without Makefile.am's,
# and their outputs.
my @other_input_files = ();
+my %other_input_files = ();
# Where the last AC_CONFIG_FILES/AC_OUTPUT appears.
my $ac_config_files_location;
@@ -3870,7 +3895,14 @@
}
elsif ($add_srcdir)
{
- push (@newinputs, '$(top_srcdir)/' . $single);
+ if (defined($other_input_files{$single}))
+ {
+ push (@newinputs, '$(top_builddir)/' . $single);
+ }
+ else
+ {
+ push (@newinputs, '$(top_srcdir)/' . $single);
+ }
}
}
@@ -4625,6 +4681,7 @@
# We have a file that automake should cause to be
# rebuilt, but shouldn't generate itself.
push (@other_input_files, $_);
+ $other_input_files{$_} = "";
}
}
}
- 1.6.2: patch-other-inputs,
hstenn <=