Changeset 977063c in freewrt for scripts

Timestamp:

Jul 8, 2006, 5:54:38 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

9282773

Parents:

dfb8263

Message:

a real fix for beta versions of GNU make

note to Ubuntu users: if your 3.81beta4 is known to
work properly, we can insert a check similar to the
Debian (scan for existence of a file in /etc) to a-
void having to use the prereq-noerror target.

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@179 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• scripts/scan-tools.sh (modified) (1 diff)

scripts/scan-tools.sh

@@ -80 +80 @@
 rm test*
 
-X=$(gmake --version 2>&1 | grep '^GNU Make' | sed 's/.*\([0-9]\.[0-9]*\).*/\1/')
-if [[ $X != +([0-9]).+([0-9]) ]]; then
+X=$(gmake --version 2>&1 | grep '^GNU Make' | sed 's/GNU Make //')
+if [[ $X = +([0-9]).+([0-9]) ]]; then
+        let major=${X%.*}
+        let minor=${X#*.}
+elif [[ $X = +([0-9]).+([0-9])beta* ]]; then
+        # Beta version is not "the real thing"
+        let major=${X%.*}
+        X=${X%beta*}
+        let minor=${X#*.}-1
+else
         echo Cannot determine GNU make version number.
         exit 1
 fi
-let major=${X%.*}
-let minor=${X#*.}
 if (( (major < 3) || ((major == 3) && (minor < 81)) )); then
         echo GNU make too old.