X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2FMKlib_gen.sh;h=71a478f6c195621f9ee1b0c0c892ee8dddf77451;hp=9e41cea2f35965b08aa48db45a59e26104f6868a;hb=def73dda3feef55f48cc205a763c06ba1ea70e78;hpb=6a530b46563470c2ca73579d1994a0c8e275dd98 diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh index 9e41cea2..71a478f6 100755 --- a/ncurses/base/MKlib_gen.sh +++ b/ncurses/base/MKlib_gen.sh @@ -2,7 +2,7 @@ # # MKlib_gen.sh -- generate sources from curses.h macro definitions # -# ($Id: MKlib_gen.sh,v 1.48 2015/07/25 19:02:45 tom Exp $) +# ($Id: MKlib_gen.sh,v 1.52 2015/10/10 19:36:47 tom Exp $) # ############################################################################## # Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. # @@ -72,9 +72,9 @@ USE="$3" # appears in gcc 5.0 and (with modification) in 5.1, making it necessary to # determine if we are using gcc, and if so, what version because the proposed # solution uses a nonstandard option. -PRG=`echo "$1" | sed -e 's/[[:space:]].*$//'` -FSF=`"$PRG" --version 2>/dev/null | fgrep "Free Software Foundation" | head -n 1` -ALL=`"$PRG" -dumpversion 2>/dev/null ` +PRG=`echo "$1" | $AWK '{ sub(/^[ ]*/,""); sub(/[ ].*$/, ""); print; }' || exit 0` +FSF=`"$PRG" --version 2>/dev/null || exit 0 | fgrep "Free Software Foundation" | head -n 1` +ALL=`"$PRG" -dumpversion 2>/dev/null || exit 0` ONE=`echo "$ALL" | sed -e 's/\..*$//'` if test -n "$FSF" && test -n "$ALL" && test -n "$ONE" ; then if test $ONE -ge 5 ; then @@ -177,6 +177,7 @@ EOF3 if test "$USE" = generated ; then cat >$ED4 <$ED4 <