make/defs.make

rev 2695 : shared changes

*** 116,133 ****
  endif
  
  # Windows should have OS predefined
  ifeq ($(OS),)
    OS   := $(shell uname -s)
    HOST := $(shell uname -n)
  endif
  
! # If not SunOS and not Linux, assume Windows
  ifneq ($(OS), Linux)
    ifneq ($(OS), SunOS)
      OSNAME=windows
    else
      OSNAME=solaris
    endif
  else
    OSNAME=linux
  endif
--- 116,143 ----
  endif
  
  # Windows should have OS predefined
  ifeq ($(OS),)
    OS   := $(shell uname -s)
+   ifneq ($(findstring BSD,$(OS)),)
+     OS=bsd
+   endif
+   ifeq ($(OS), Darwin)
+     OS=bsd
+   endif
    HOST := $(shell uname -n)
  endif
  
! # If not SunOS, not Linux and not BSD, assume Windows
  ifneq ($(OS), Linux)
    ifneq ($(OS), SunOS)
+     ifneq ($(OS), bsd)
        OSNAME=windows
      else
+       OSNAME=bsd
+     endif
+   else
      OSNAME=solaris
    endif
  else
    OSNAME=linux
  endif