diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2009-04-07 14:37:35 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2009-04-07 14:37:35 +0100 |
| commit | ca01c742be35d7556ff072587d644d761a4a05e2 (patch) | |
| tree | 4df4b992cc09f9624607d246869f81797e7443d3 | |
| parent | bf70c786774b46ceea11f88ab5fe416789532478 (diff) | |
| download | xen-ca01c742be35d7556ff072587d644d761a4a05e2.tar.gz xen-ca01c742be35d7556ff072587d644d761a4a05e2.tar.bz2 xen-ca01c742be35d7556ff072587d644d761a4a05e2.zip | |
tools: fix python installation
attached patch lets python install the modules into
DESTDIR/PREFIX as before, but lets python search
the modules in PREFIX rather DESTDIR/PREFIX.
This prevents failures about not finding python modules
after files have been installed into PREFIX.
Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
| -rw-r--r-- | tools/pygrub/Makefile | 3 | ||||
| -rw-r--r-- | tools/python/Makefile | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile index 48e982c075..0e30db481c 100644 --- a/tools/pygrub/Makefile +++ b/tools/pygrub/Makefile @@ -10,9 +10,8 @@ build: .PHONY: install ifndef XEN_PYTHON_NATIVE_INSTALL -install: LIBPATH=$(shell PYTHONPATH=../python/xen/util python -c "import auxbin; print auxbin.libpath()") install: all - CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)$(PREFIX)" --prefix="" --install-lib="$(DESTDIR)$(LIBDIR)/python" + CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --home="$(PREFIX)" --prefix="" --force $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot else install: all diff --git a/tools/python/Makefile b/tools/python/Makefile index 249bf634e7..700640645b 100644 --- a/tools/python/Makefile +++ b/tools/python/Makefile @@ -55,9 +55,8 @@ refresh-po: $(POTFILE) .PHONY: install ifndef XEN_PYTHON_NATIVE_INSTALL -install: LIBPATH=$(shell PYTHONPATH=xen/util python -c "import auxbin; print auxbin.libpath()") install: install-messages install-dtd - CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)$(PREFIX)" --prefix="" --force --install-lib="$(DESTDIR)$(LIBDIR)/python" + CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --home="$(PREFIX)" --prefix="" --force else install: install-messages install-dtd CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --force |