Revision 10832,
1.3 KB
checked in by brlewis, 27 years ago
(diff) |
This commit was generated by cvs2svn to compensate for changes in r10831,
which included commits to RCS files with non-trunk default branches.
|
Line | |
---|
1 | diff -ur automake-1.2/automake.in automake-1.2.1/automake.in |
---|
2 | --- automake-1.2/automake.in Sun Jun 22 21:47:56 1997 |
---|
3 | +++ automake-1.2.1/automake.in Mon Jun 30 19:31:59 1997 |
---|
4 | @@ -610,6 +610,7 @@ |
---|
5 | { |
---|
6 | return 0 if ! &variable_defined ('AUTOMAKE_OPTIONS'); |
---|
7 | |
---|
8 | + $use_distdir = '$(PACKAGE)-$(VERSION)'; |
---|
9 | foreach (&variable_value_as_list ('AUTOMAKE_OPTIONS', '')) |
---|
10 | { |
---|
11 | $options{$_} = 1; |
---|
12 | @@ -635,6 +636,10 @@ |
---|
13 | { |
---|
14 | $use_dependencies = 0; |
---|
15 | } |
---|
16 | + elsif (/distdir=(\S+)/) |
---|
17 | + { |
---|
18 | + $use_distdir = "$1"; |
---|
19 | + } |
---|
20 | elsif (/([0-9]+)\.([0-9]+)/) |
---|
21 | { |
---|
22 | # Got a version number. Note that alpha releases count as |
---|
23 | @@ -920,8 +921,10 @@ |
---|
24 | local ($base, @objects); |
---|
25 | foreach $base (sort (keys %de_ansi_files)) |
---|
26 | { |
---|
27 | - $output_rules .= $base . "_.c: $base.c\n\t" |
---|
28 | - . '$(ANSI2KNR) $< ' . $base . "_.c\n"; |
---|
29 | + # Each _.c file must depend on ansi2knr; otherwise it |
---|
30 | + # might be used in a parallel build before it is built. |
---|
31 | + $output_rules .= $base . "_.c: $base.c \$(ANSI2KNR)\n\t" |
---|
32 | + . '$(ANSI2KNR) ' . $base . '.c ' . $base . "_.c\n"; |
---|
33 | push (@objects, $base . '_.o'); |
---|
34 | push (@objects, $base . '_.lo') if $seen_libtool; |
---|
35 | } |
---|
36 | @@ -2467,7 +2472,7 @@ |
---|
37 | { |
---|
38 | if ($relative_dir eq '.') |
---|
39 | { |
---|
40 | - $output_rules .= "\n" . 'distdir = $(PACKAGE)-$(VERSION)' . "\n"; |
---|
41 | + $output_rules .= "\n" . 'distdir = ' . $use_distdir . "\n"; |
---|
42 | } |
---|
43 | else |
---|
44 | { |
---|
Note: See
TracBrowser
for help on using the repository browser.