Changeset 3092

Show
Ignore:
Timestamp:
07/02/07 22:01:30 (1 year ago)
Author:
tg
Message:

netbsd® is more cruel™

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r3091 r3092  
    8686        bmake=/usr/bin/make 
    8787        ;; 
     88NetBSD) 
     89        echo Warning: NetBSD® support is not completed. 
     90        echo 
     91        ;; 
    8892OpenBSD) 
    8993        # supported with no extra quirks at the moment 
    …… 
    357361fi 
    358362 
    359 if [[ ! -s /usr/include/ncurses.h ]]; then 
     363[[ -s /usr/include/ncurses.h ]] || if [[ -s /usr/pkg/include/ncurses.h ]]; then 
     364        echo 'HOSTCFLAGS+= -isystem /usr/pkg/include' >>$topdir/lbin/prereq.mk 
     365        echo 'HOSTLDFLAGS+=-L/usr/pkg/lib -Wl,-rpath -Wl,/usr/pkg/lib' >>$topdir/lbin/prereq.mk 
     366else 
    360367        echo Install ncurses header files, please. 
    361368        echo 
    …… 
    369376fi 
    370377 
    371 #if ! which perl >/dev/null 2>&1; then 
    372 if [[ "$(which perl 2>/dev/null)" != /usr/bin/perl ]]; then 
     378if ! which perl >/dev/null 2>&1; then 
     379#if [[ "$(which perl 2>/dev/null)" != /usr/bin/perl ]]; then 
    373380        echo You must install Perl in /usr/bin to continue. 
    374381        echo 

  • trunk/freewrt/tools/config/Makefile

    r2727 r3092  
    2424HOSTCFLAGS+=    -I/usr/local/include/ncurses -DCURSES_LOC="<ncurses/curses.h>" 
    2525else 
     26ifeq (/usr/pkg/include/ncurses.h, $(wildcard /usr/pkg/include/ncurses.h)) 
     27HOSTCFLAGS+=    -I/usr/pkg/include -DCURSES_LOC="<ncurses.h>" 
     28LIBS+=          -L/usr/pkg/lib -Wl,-rpath -Wl,/usr/pkg/lib 
     29else 
    2630ifeq (/usr/include/ncurses.h, $(wildcard /usr/include/ncurses.h)) 
    2731HOSTNCURSES+=   -DCURSES_LOC="<ncurses.h>" 
    2832else 
    2933HOSTNCURSES+=   -DCURSES_LOC="<curses.h>" 
     34endif 
    3035endif 
    3136endif