diff options
| author | Luka Perkov <luka.perkov@sartura.hr> | 2016-10-09 21:13:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-09 21:13:55 +0200 |
| commit | b21852c60f82bbd53c19098fc0eb1f4cfccfaf35 (patch) | |
| tree | 5f2b6429c0e1115a96e0ad96c375fa339fe367a1 | |
| parent | ca3f1a614a1ee90fc67188b375888517f0c151df (diff) | |
| parent | aab91be7b26c9ffd6b83a41c18728d169e85592c (diff) | |
| download | upstream-b21852c60f82bbd53c19098fc0eb1f4cfccfaf35.tar.gz upstream-b21852c60f82bbd53c19098fc0eb1f4cfccfaf35.tar.bz2 upstream-b21852c60f82bbd53c19098fc0eb1f4cfccfaf35.zip | |
Merge pull request #116 from imShara/fix_feeds
scripts: feeds: fix version detection for Make >= 4.2.1
| -rwxr-xr-x | scripts/feeds | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/feeds b/scripts/feeds index f8f29cd9dd..908e56c60e 100755 --- a/scripts/feeds +++ b/scripts/feeds @@ -22,7 +22,10 @@ my @mkver = split /\s+/, `$mk -v`, 4; my $valid_mk = 1; $mkver[0] =~ /^GNU/ or $valid_mk = 0; $mkver[1] =~ /^Make/ or $valid_mk = 0; -$mkver[2] >= "3.81" or $valid_mk = 0; + +my ($mkv1, $mkv2) = split /\./, $mkver[2]; +($mkv1 >= 4 || ($mkv1 == 3 && $mkv2 >= 81)) or $valid_mk = 0; + $valid_mk or die "Unsupported version of make found: $mk\n"; my @feeds; |