From 129d38fa83dffa5bc6e17ed2454f32b14c43dbf3 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Thu, 17 Sep 2009 00:38:39 +0300 Subject: [PATCH] --- yaml --- r: 167420 b: refs/heads/master c: 9c3049c02c6142e166c9472237f1f60d86153682 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/scripts/mkcompile_h | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bb09a692e2fd..d6c94160bf49 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58242b2b065557f8467a8630f7c9b2b4b2eb891f +refs/heads/master: 9c3049c02c6142e166c9472237f1f60d86153682 diff --git a/trunk/scripts/mkcompile_h b/trunk/scripts/mkcompile_h index 6a12dd9f1181..f060763c0c6a 100755 --- a/trunk/scripts/mkcompile_h +++ b/trunk/scripts/mkcompile_h @@ -66,9 +66,13 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/" echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\" if [ -x /bin/dnsdomainname ]; then - echo \#define LINUX_COMPILE_DOMAIN \"`dnsdomainname | $UTS_TRUNCATE`\" + domain=`dnsdomainname 2> /dev/null` elif [ -x /bin/domainname ]; then - echo \#define LINUX_COMPILE_DOMAIN \"`domainname | $UTS_TRUNCATE`\" + domain=`domainname 2> /dev/null` + fi + + if [ -n "$domain" ]; then + echo \#define LINUX_COMPILE_DOMAIN \"`echo $domain | $UTS_TRUNCATE`\" else echo \#define LINUX_COMPILE_DOMAIN fi