Skip to contentSkip to conversation

tools: fix python installation

PATCH New Christoph Egger 1 participant 1 message Apr 7, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tools: fix python installation

Hi,

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.

Signature · 6 lines
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Jochen Polster, Thomas M. McCoy, Giuliano Meroni
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632
tools/pygrub/Makefile +1 -2
diff -r accf139b2eb9 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
tools/python/Makefile +1 -2
diff -r accf139b2eb9 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

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel