Changeset 78

Show
Ignore:
Timestamp:
06/18/06 11:58:12 (6 years ago)
Author:
tg
Message:

On Debian, gmake 3.80 "seems to be" enough.
Allow the user to override the version check,
point to the FAQ.

requested by and "okay, cool" wbx@

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/Makefile

    r76 r78  
    8080        @${GMAKE_INV} world 
    8181 
     82prereq-noerror: 
     83        @${MAKE} prereq NO_ERROR=1 
     84 
     85NO_ERROR=0 
    8286prereq: 
    8387        @-rm -rf prereq lbin 
    …… 
    114118        @echo "export HOSTCC HOSTCFLAGS LC_ALL MAKE OStype PATH" \ 
    115119            >>lbin/prereq.mk 
    116         @bash scripts/scan-tools.sh 
     120        @env NO_ERROR=${NO_ERROR} bash scripts/scan-tools.sh 
    117121        @touch $@ 

  • trunk/freewrt/scripts/scan-tools.sh

    r77 r78  
    4242export PATH=$topdir/lbin:$PATH 
    4343 
     44if [[ $NO_ERROR != @(0|1) ]]; then 
     45        echo Please do not invoke this script directly! 
     46        exit 1 
     47fi 
     48 
    4449set -e 
    4550rm -rf $topdir/lbin/tmp 
    …… 
    8489        echo GNU make too old. 
    8590        echo Please install GNU make 3.81 or higher to continue. 
    86         exit 1 
     91        if [[ $NO_ERROR = 1 ]]; then 
     92                echo WARNING: should abort here, continuing... 
     93        else 
     94                echo You can override this check, see http://www.freewrt.org/faq for details. 
     95                exit 1 
     96        fi 
    8797fi 
    8898