From: Roy Marples <roy@marples.name>
Date: Thu, 27 Mar 2008 20:10:31 +0000 (+0000)
Subject: If not Linux then assume BSD.
X-Git-Tag: v4.0.2~534
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce51e90ffa9b9fc2001f0918ffee28201e5bfd70;p=thirdparty%2Fdhcpcd.git

If not Linux then assume BSD.
---

diff --git a/README b/README
index 9089ec69..f70fd563 100644
--- a/README
+++ b/README
@@ -16,8 +16,10 @@ man dhcpcd for command line options
 
 Notes
 -----
-If you're cross compiling you may need to send HAVE_FORK=yes or HAVE_FORK=no
-to the make command to avoid to automatic test.
+If you're cross compiling you may need to set the below knobs to avoid
+automatic tests.
+HAVE_FORK=yes | no
+OS=BSD | Linux
 
 We try and detect how to restart ntp and ypbind, you can override this with
 HAVE_INIT=no or force one of these values
diff --git a/mk/os.mk b/mk/os.mk
index a093f072..f2a83f40 100644
--- a/mk/os.mk
+++ b/mk/os.mk
@@ -1,7 +1,7 @@
 # Setup OS specific variables
 # Copyright 2008 Roy Marples <roy@marples.name>
 
-_UNAME_S_SH=	case `uname -s` in *BSD|DragonFly) echo "BSD";; *) uname -s;; esac
-_UNAME_S!=	${_UNAME_S_SH}
-UNAME_S=	${_UNAME_S}$(shell ${_UNAME_S_SH})
-include ${MK}/os-${UNAME_S}.mk
+_OS_SH=	case `uname -s` in Linux) echo "Linux";; *) echo "BSD";; esac
+_OS!=		${_OS_SH}
+OS=		${_OS}$(shell ${_OS_SH})
+include ${MK}/os-${OS}.mk