diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-06-02 08:18:06 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-06-02 08:18:06 -0400 |
| commit | c7a441bba9de3b4e166b6a4449208bc906d70558 (patch) | |
| tree | 346fdf11e464c8201a9aaa8abdd1c1b6dc4f86e0 /scripts/mkcompile_h | |
| parent | ead54d878465291746c91c95749990d62742a6cf (diff) | |
| parent | e4caa8bab3862a7694ab7c6dfede223227ad7fc5 (diff) | |
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'scripts/mkcompile_h')
| -rwxr-xr-x | scripts/mkcompile_h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h index 23dbad80cce9..50ad317a4bf9 100755 --- a/scripts/mkcompile_h +++ b/scripts/mkcompile_h | |||
| @@ -67,9 +67,8 @@ UTS_TRUNCATE="cut -b -$UTS_LEN" | |||
| 67 | echo \#define LINUX_COMPILE_BY \"`whoami`\" | 67 | echo \#define LINUX_COMPILE_BY \"`whoami`\" |
| 68 | echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\" | 68 | echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\" |
| 69 | 69 | ||
| 70 | if [ -x /bin/dnsdomainname ]; then | 70 | domain=`dnsdomainname 2> /dev/null` |
| 71 | domain=`dnsdomainname 2> /dev/null` | 71 | if [ -z "$domain" ]; then |
| 72 | elif [ -x /bin/domainname ]; then | ||
| 73 | domain=`domainname 2> /dev/null` | 72 | domain=`domainname 2> /dev/null` |
| 74 | fi | 73 | fi |
| 75 | 74 | ||