diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/misc/netfix | 4 | ||||
| -rw-r--r-- | tools/misc/xend | 4 | ||||
| -rwxr-xr-x | tools/misc/xensv | 4 | ||||
| -rwxr-xr-x | tools/misc/xm | 4 | ||||
| -rw-r--r-- | tools/xentrace/Makefile | 12 |
5 files changed, 14 insertions, 14 deletions
diff --git a/tools/misc/netfix b/tools/misc/netfix index ab5a04cdef..32f1021732 100644 --- a/tools/misc/netfix +++ b/tools/misc/netfix @@ -9,8 +9,8 @@ from getopt import getopt -# Default install path for Xen binary packages. -sys.path = [ '/usr/lib/python' ] + sys.path +# add fallback path for non-native python path installs if needed +sys.path.append('/usr/lib/python') from xen.util.Brctl import * short_options = 'hvqni:b:c' diff --git a/tools/misc/xend b/tools/misc/xend index 6360a35aeb..57fbe14567 100644 --- a/tools/misc/xend +++ b/tools/misc/xend @@ -30,8 +30,8 @@ XCS_EXEC = "/usr/sbin/xcs" XCS_PIDFILE = "/var/run/xcs.pid" XCS_ARGS = (XCS_EXEC, "-p", XCS_PIDFILE) -# Default install path for Xen binary packages. -sys.path = [ '/usr/lib/python' ] + sys.path +# add fallback path for non-native python path installs if needed +sys.path.append('/usr/lib/python') from xen.xend.server import SrvDaemon class CheckError(ValueError): diff --git a/tools/misc/xensv b/tools/misc/xensv index 7924840615..8596457cd7 100755 --- a/tools/misc/xensv +++ b/tools/misc/xensv @@ -22,8 +22,8 @@ import os import sys import re -# Default install path for Xen binary packages. -sys.path = [ '/usr/lib/python' ] + sys.path +# add fallback path for non-native python path installs if needed +sys.path.append('/usr/lib/python') from xen.xend.server.params import XEND_PID_FILE class CheckError(ValueError): diff --git a/tools/misc/xm b/tools/misc/xm index 86e45573d0..6bf8931323 100755 --- a/tools/misc/xm +++ b/tools/misc/xm @@ -2,8 +2,8 @@ # -*- mode: python; -*- import sys -# Default install path for Xen binary packages. -sys.path = [ '/usr/lib/python' ] + sys.path +# add fallback path for non-native python path installs if needed +sys.path.append('/usr/lib/python') from xen.xm import main main.main(sys.argv) diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index 5498c458e1..faa0a46bf8 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -25,13 +25,13 @@ build: $(BIN) install: build [ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin - [ -d $(DESTDIR)/usr/man/man1 ] || \ - $(INSTALL_DIR) $(DESTDIR)/usr/man/man1 - [ -d $(DESTDIR)/usr/man/man8 ] || \ - $(INSTALL_DIR) $(DESTDIR)/usr/man/man8 + [ -d $(DESTDIR)/usr/share/man/man1 ] || \ + $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1 + [ -d $(DESTDIR)/usr/share/man/man8 ] || \ + $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8 $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin - $(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/man/man1 - $(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/man/man8 + $(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1 + $(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8 clean: $(RM) *.a *.so *.o *.rpm $(BIN) |