diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-26 19:27:00 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-26 19:27:00 +0200 |
| commit | c67dda14389205f0a223c5089307495290939b3b (patch) | |
| tree | fad0bb26b28703d02a22ebdd44d94eabac4a2ade /scripts/mkcompile_h | |
| parent | sparc64: fix the build error due to smp_kgdb_capture_client() (diff) | |
| parent | Linux 2.6.35-rc3 (diff) | |
| download | linux-c67dda14389205f0a223c5089307495290939b3b.tar.xz linux-c67dda14389205f0a223c5089307495290939b3b.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
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" 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 |