ia64/xen-unstable

changeset 19518:d9de5cc2b0bc

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>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Apr 07 14:37:35 2009 +0100 (2009-04-07)
parents 47e836fc59de
children cb453e5a2f81
files tools/pygrub/Makefile tools/python/Makefile
line diff
     1.1 --- a/tools/pygrub/Makefile	Tue Apr 07 14:24:53 2009 +0100
     1.2 +++ b/tools/pygrub/Makefile	Tue Apr 07 14:37:35 2009 +0100
     1.3 @@ -10,9 +10,8 @@ build:
     1.4  
     1.5  .PHONY: install
     1.6  ifndef XEN_PYTHON_NATIVE_INSTALL
     1.7 -install: LIBPATH=$(shell PYTHONPATH=../python/xen/util python -c "import auxbin; print auxbin.libpath()")
     1.8  install: all
     1.9 -	CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)$(PREFIX)" --prefix="" --install-lib="$(DESTDIR)$(LIBDIR)/python"
    1.10 +	CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --home="$(PREFIX)" --prefix="" --force
    1.11  	$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
    1.12  else
    1.13  install: all
     2.1 --- a/tools/python/Makefile	Tue Apr 07 14:24:53 2009 +0100
     2.2 +++ b/tools/python/Makefile	Tue Apr 07 14:37:35 2009 +0100
     2.3 @@ -55,9 +55,8 @@ refresh-po: $(POTFILE)
     2.4  
     2.5  .PHONY: install
     2.6  ifndef XEN_PYTHON_NATIVE_INSTALL
     2.7 -install: LIBPATH=$(shell PYTHONPATH=xen/util python -c "import auxbin; print auxbin.libpath()")
     2.8  install: install-messages install-dtd
     2.9 -	CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)$(PREFIX)" --prefix="" --force --install-lib="$(DESTDIR)$(LIBDIR)/python"
    2.10 +	CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --home="$(PREFIX)" --prefix="" --force
    2.11  else
    2.12  install: install-messages install-dtd
    2.13  	CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --force