bitkeeper revision 1.1159.170.89 (41e4ef8aHmcX3lP2zVDZBpN59cSX6A)

Python packages always install to ${prefix}/us/lib/python/xen/...

tools/misc/netfix

@@ -10,7 +10,7 @@
 from getopt import getopt
 
 # Default install path for Xen binary packages.
-sys.path.append('/lib/python')
+sys.path = [ '/usr/lib/python' ] + sys.path
 from xen.util.Brctl import *
 
 short_options = 'hvqni:b:c'

tools/misc/xend

@@ -23,7 +23,7 @@ import os
 import sys
 
 # Default install path for Xen binary packages.
-sys.path.append('/lib/python')
+sys.path = [ '/usr/lib/python' ] + sys.path
 from xen.xend.server import SrvDaemon
 
 class CheckError(ValueError):

tools/misc/xensv

@@ -23,7 +23,7 @@ import sys
 import re
 
 # Default install path for Xen binary packages.
-sys.path.append('/lib/python')
+sys.path = [ '/usr/lib/python' ] + sys.path
 from xen.xend.server.params import XEND_PID_FILE
 
 class CheckError(ValueError):

tools/misc/xm

@@ -3,7 +3,7 @@
 import sys
 
 # Default install path for Xen binary packages.
-sys.path.append('/lib/python')
+sys.path = [ '/usr/lib/python' ] + sys.path
 from xen.xm import main
 
 main.main(sys.argv)

tools/python/Makefile

@@ -3,13 +3,7 @@ all:
 	python setup.py build
 
 install: all
-	if [ "$(prefix)" = "" ]; then                   \
-	    python setup.py install;                    \
-	elif [ "$(dist)" = "yes" ]; then                \
-	    python setup.py install --home="$(prefix)"; \
-	else                                            \
-	    python setup.py install --root="$(prefix)"; \
-	fi
+	python setup.py install --home="$(prefix)/usr"
 
 clean:
 	rm -rf build *.pyc *.pyo *.o *.a *~