diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2009-05-07 19:32:10 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2009-05-07 19:32:10 +0100 |
| commit | 727a00e80e581ee15ea2b7caea3fe27c415164f5 (patch) | |
| tree | b0b2c380052ec215eaa5ea867024e9a8173ac70d /tools/pygrub/Makefile | |
| parent | ca8d042e26e9b6e98e2b6bfcbba0c8025e135012 (diff) | |
| download | xen-727a00e80e581ee15ea2b7caea3fe27c415164f5.tar.gz xen-727a00e80e581ee15ea2b7caea3fe27c415164f5.tar.bz2 xen-727a00e80e581ee15ea2b7caea3fe27c415164f5.zip | |
Permit user to suppress passing --prefix to setup.py
We change all invocations of setup.py as follows:
* use $(PYTHON) instead of `python' so that the user can specify
an alternative python version if they need to. If not set it
defaults to `python' in Config.mk.
* pass --prefix=$(PREFIX) via a new make variable
$(PYTHON_PREFIX_ARG). This allows a user to suppress the
--prefix=... argument entirely by setting PYTHON_PREFIX_ARG=''.
This will work around the bug described here
https://bugs.launchpad.net/ubuntu/+bug/362570
where passing --prefix=/usr/local (which ought to have no effect as
/usr/local is the default prefix) changes which subdirectory
distutils chooses, and results in the files being installed in
site-packages which is not on the default search path.
Users not affected by this python packaging bug should not set
PYTHON_PREFIX_ARG and their builds will not be affected. (Provided
PREFIX did not contain spaces. People who put spaces in PREFIX are
being quite optimistic.)
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/pygrub/Makefile')
| -rw-r--r-- | tools/pygrub/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile index 0791012e2a..b8b64a7794 100644 --- a/tools/pygrub/Makefile +++ b/tools/pygrub/Makefile @@ -6,12 +6,12 @@ include $(XEN_ROOT)/tools/Rules.mk all: build .PHONY: build build: - CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py build + CC="$(CC)" CFLAGS="$(CFLAGS)" $(PYTHON) setup.py build .PHONY: install install: all - CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install \ - --prefix="$(PREFIX)" --root="$(DESTDIR)" --force + CC="$(CC)" CFLAGS="$(CFLAGS)" $(PYTHON) setup.py install \ + $(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" --force $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot .PHONY: clean |