[Xen-changelog] [xen-unstable] tools: fix python installation

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1239111455 -3600
# Node ID d9de5cc2b0bcd2e910f939afb6fcf3193a5cc5f4
# Parent  47e836fc59de1344279915774e1540015e7f7640
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@xxxxxxx>
---
 tools/pygrub/Makefile |    3 +--
 tools/python/Makefile |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff -r 47e836fc59de -r d9de5cc2b0bc tools/pygrub/Makefile
--- a/tools/pygrub/Makefile     Tue Apr 07 14:24:53 2009 +0100
+++ b/tools/pygrub/Makefile     Tue Apr 07 14:37:35 2009 +0100
@@ -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 -r 47e836fc59de -r d9de5cc2b0bc tools/python/Makefile
--- a/tools/python/Makefile     Tue Apr 07 14:24:53 2009 +0100
+++ b/tools/python/Makefile     Tue Apr 07 14:37:35 2009 +0100
@@ -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

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog