From: Roy Marples Date: Mon, 3 Mar 2014 17:25:28 +0000 (+0000) Subject: Just make the configure a bit easier. X-Git-Tag: v6.3.2~40 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b3574a2516b8b52c50bfb289a2631b25c744295b;p=thirdparty%2Fdhcpcd.git Just make the configure a bit easier. --- diff --git a/configure b/configure index 52ce5b0d..7fb300b0 100755 --- a/configure +++ b/configure @@ -203,16 +203,8 @@ if [ -z "$OS" ]; then VENDOR=${REST%%-*} REST=${REST#*-} if [ "$VENDOR" != "$REST" ]; then - KERNEL=${REST%%-*} - REST=${REST#*-} - if [ "$KERNEL" != "$REST" ]; then - # 4 tupple - OS=${REST%%-*} - else - # 3 tupple - OS=$KERNEL - KERNEL= - fi + # Use kernel if given, otherwise os + OS=${REST%%-*} else # 2 tupple OS=$VENDOR @@ -221,11 +213,13 @@ if [ -z "$OS" ]; then fi # Work with cpu-kernel-os, ie Debian - if [ "$VENDOR" = linux ]; then - KERNEL=$OS - OS=linux - VENDOR= - fi + case "$VENDOR" in + linux|kfreebsd) OS=$VENDOR; VENDOR= ;; + esac + # Special case + case "$OS" in + gnu) OS=hurd;; # No HURD support as yet + esac fi echo "Configuring dhcpcd for ... $OS"