Mercurial > hg > truffle

diff make/defs.make @ 3967:da883b9e6d37 hs23-b01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author jcoomes
date Fri, 30 Sep 2011 18:27:39 -0700
parents f08d439fab8c
children 436b4a3231bf
line wrap: on
line diff
--- a/make/defs.make	Thu Sep 29 18:53:42 2011 -0700
+++ b/make/defs.make	Fri Sep 30 18:27:39 2011 -0700
@@ -118,13 +118,23 @@
 # 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 and not Linux, assume Windows
+# If not SunOS, not Linux and not BSD, assume Windows
 ifneq ($(OS), Linux)
   ifneq ($(OS), SunOS)
-    OSNAME=windows
+    ifneq ($(OS), bsd)
+      OSNAME=windows
+    else
+      OSNAME=bsd
+    endif
   else
     OSNAME=solaris
   endif