make/defs.make

changeset 3156
f08d439fab8c
parent 2544
b76d12f4ab2d
child 3202
436b4a3231bf
     1.1 --- a/make/defs.make	Tue Sep 20 23:50:16 2011 -0700
     1.2 +++ b/make/defs.make	Sun Sep 25 16:03:29 2011 -0700
     1.3 @@ -118,13 +118,23 @@
     1.4  # Windows should have OS predefined
     1.5  ifeq ($(OS),)
     1.6    OS   := $(shell uname -s)
     1.7 +  ifneq ($(findstring BSD,$(OS)),)
     1.8 +    OS=bsd
     1.9 +  endif
    1.10 +  ifeq ($(OS), Darwin)
    1.11 +    OS=bsd
    1.12 +  endif
    1.13    HOST := $(shell uname -n)
    1.14  endif
    1.15  
    1.16 -# If not SunOS and not Linux, assume Windows
    1.17 +# If not SunOS, not Linux and not BSD, assume Windows
    1.18  ifneq ($(OS), Linux)
    1.19    ifneq ($(OS), SunOS)
    1.20 -    OSNAME=windows
    1.21 +    ifneq ($(OS), bsd)
    1.22 +      OSNAME=windows
    1.23 +    else
    1.24 +      OSNAME=bsd
    1.25 +    endif
    1.26    else
    1.27      OSNAME=solaris
    1.28    endif

mercurial