diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-21 13:04:18 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-21 13:04:18 +0100 |
commit | 7f87000741f4061aeb28c10105beb751eb9ee639 (patch) | |
tree | c94976669d7ed66a64fd85f4c3665a4266cfd293 /Makefile | |
parent | 7cc1307c17dd9dfc907580b7b3320554848a10de (diff) | |
parent | 33f92f3466c9959e73e01f50861495162f681164 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -5,7 +5,8 @@ CC?= gcc GMAKE?= $(PWD)/scripts/make GMAKE_FMK= ${GMAKE} -f $(PWD)/mk/build.mk GMAKE_INV= ${GMAKE_FMK} --no-print-directory -_UNLIMIT= ulimit -dS $$(ulimit -dH); + +_UNLIMIT= ulimit -dS $$(ulimit -dH 2>/dev/null ) 2>/dev/null; all: .prereq_done @${_UNLIMIT} ${GMAKE_INV} all @@ -163,7 +164,7 @@ NO_ERROR=0 fi @echo "TOPDIR:=$$(readlink -nf . 2>/dev/null || pwd -P)" >prereq.mk @echo "BASH:=$$(which bash)" >>prereq.mk - @if [ -z "$$(which gmake)" ]; then \ + @if [ -z "$$(which gmake 2>/dev/null )" ]; then \ echo "GMAKE:=$$(which make)" >>prereq.mk ;\ else \ echo "GMAKE:=$$(which gmake)" >>prereq.mk ;\ |