1.1 --- a/xen/Makefile	Thu May 01 16:35:49 2008 +0100
     1.2 +++ b/xen/Makefile	Thu May 01 16:36:58 2008 +0100
     1.3 @@ -6,6 +6,9 @@ export XEN_EXTRAVERSION ?= -unstable$(XE
     1.4  export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
     1.5  -include xen-version
     1.6  
     1.7 +export XEN_WHOAMI	?= $(USER)
     1.8 +export XEN_DOMAIN	?= $(shell ([ -x /bin/dnsdomainname ] && /bin/dnsdomainname) || ([ -x /bin/domainname ] && /bin/domainname || echo [unknown]))
     1.9 +
    1.10  export BASEDIR := $(CURDIR)
    1.11  
    1.12  .PHONY: default
    1.13 @@ -81,8 +84,8 @@ delete-unfresh-files:
    1.14  include/xen/compile.h: include/xen/compile.h.in .banner
    1.15  	@sed -e 's/@@date@@/$(shell LC_ALL=C date)/g' \
    1.16  	    -e 's/@@time@@/$(shell LC_ALL=C date +%T)/g' \
    1.17 -	    -e 's/@@whoami@@/$(USER)/g' \
    1.18 -	    -e 's/@@domain@@/$(shell ([ -x /bin/dnsdomainname ] && /bin/dnsdomainname) || ([ -x /bin/domainname ] && /bin/domainname || echo [unknown]))/g' \
    1.19 +	    -e 's/@@whoami@@/$(XEN_WHOAMI)/g' \
    1.20 +	    -e 's/@@domain@@/$(XEN_DOMAIN)/g' \
    1.21  	    -e 's/@@hostname@@/$(shell hostname)/g' \
    1.22  	    -e 's!@@compiler@@!$(shell $(CC) $(CFLAGS) -v 2>&1 | grep -i "gcc.*version")!g' \
    1.23  	    -e 's/@@version@@/$(XEN_VERSION)/g' \