bitkeeper revision 1.1159.212.34 (41f5a289J4SAf6zaQUhGEBrQWQ14dA)

manual merge

tools/python/Makefile

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

tools/python/xen/sv/params.py

@@ -1,3 +1,3 @@
 SV_PORT = 8080
-SV_ROOT = "/var/xen/sv/"
-PID_FILE = "/var/xen/sv.pid"
+SV_ROOT = "/var/lib/xen/sv/"
+PID_FILE = "/var/run/xen-sv.pid"

tools/python/xen/xend/XendRoot.py

@@ -20,7 +20,7 @@ class XendRoot:
     """Root of the management classes."""
 
     """Default path to the root of the database."""
-    dbroot_default = "/var/xen/xend-db"
+    dbroot_default = "/var/lib/xen/xend-db"
 
     """Default path to the config file."""
     config_default = "/etc/xen/xend-config.sxp"

tools/python/xen/xend/server/SrvServer.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python
 # Copyright (C) 2004 Mike Wray <mike.wray@hp.com>
 
 """Example xend HTTP and console server.

tools/python/xen/xend/sxp.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python
 # Copyright (C) 2004 Mike Wray <mike.wray@hp.com>
 """
 Input-driven parsing for s-expression (sxp) format.