diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-09-12 13:15:36 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-09-12 13:15:36 +0100 |
| commit | 30c988711cbbd177c8f865347948565583de56db (patch) | |
| tree | 392b26c5b250b349ec45cf564da78ee453895cce /tools/Makefile | |
| parent | 8d701af28f2e5777a5cee19346a60859841459c6 (diff) | |
| download | xen-30c988711cbbd177c8f865347948565583de56db.tar.gz xen-30c988711cbbd177c8f865347948565583de56db.tar.bz2 xen-30c988711cbbd177c8f865347948565583de56db.zip | |
$(XEN_ROOT) absolutification fixes for ioemu-remote (incl stubdom)
* Move code for generating an absolute version of XEN_ROOT
into a common make variable set in Config.mk
* Use this common code when invoking make -C ioemu-dir clean
from tools/, which avoids a problem where `make clean' fails
because qemu's (ioemu-remote's) build system wants to run
`make clean' in `tests' but XEN_ROOT is a confection involving
../'s.
* Use this common code in stubdom/Makefile, instead of $(abspath...)
as the latter is a relatively new feature in GNU make and is not
available in all the places that we want to be able to build
(cf c/s 17997:3f23e01d31985899dbd1660b166f229f1ee74292)
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/Makefile')
| -rw-r--r-- | tools/Makefile | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tools/Makefile b/tools/Makefile index ed206deba6..71770a76ad 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -93,17 +93,14 @@ ioemu-dir-find: ln -sf ioemu-remote ioemu-dir; \ fi set -e; \ - case "$(XEN_ROOT)" in \ - /*) XEN_ROOT=$(XEN_ROOT) ;; \ - *) XEN_ROOT=`pwd`/$(XEN_ROOT) ;; \ - esac; \ - export XEN_ROOT; \ + $(absolutify_xen_root); \ cd ioemu-dir; \ ./xen-setup $(IOEMU_CONFIGURE_CROSS) subdir-all-ioemu-dir subdir-install-ioemu-dir: ioemu-dir-find subdir-clean-ioemu-dir: - if test -d ioemu-dir/.; then \ + set -e; if test -d ioemu-dir/.; then \ + $(absolutify_xen_root); \ $(MAKE) -C ioemu-dir clean; \ fi |