diff --git a/[refs] b/[refs] index f07169bca244..50b261caa361 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e66f25d7d1be19e177cf55126a40799757efae89 +refs/heads/master: d4987bd7ae8401bd88896a6f76dc7af31fe55732 diff --git a/trunk/scripts/mkcompile_h b/trunk/scripts/mkcompile_h index 23dbad80cce9..50ad317a4bf9 100755 --- a/trunk/scripts/mkcompile_h +++ b/trunk/scripts/mkcompile_h @@ -67,9 +67,8 @@ UTS_TRUNCATE="cut -b -$UTS_LEN" echo \#define LINUX_COMPILE_BY \"`whoami`\" echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\" - if [ -x /bin/dnsdomainname ]; then - domain=`dnsdomainname 2> /dev/null` - elif [ -x /bin/domainname ]; then + domain=`dnsdomainname 2> /dev/null` + if [ -z "$domain" ]; then domain=`domainname 2> /dev/null` fi