aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2009-05-20 15:27:30 +0100
committerKeir Fraser <keir.fraser@citrix.com>2009-05-20 15:27:30 +0100
commit9f6d07bac9f14aaa8bafe38b4a217e61a3a57842 (patch)
tree2ead5886b741eb234383d15b1588da4807ae28a6 /config
parente7da8a7b69a23e0c906c7fb019061b82f943c9a6 (diff)
downloadxen-9f6d07bac9f14aaa8bafe38b4a217e61a3a57842.tar.gz
xen-9f6d07bac9f14aaa8bafe38b4a217e61a3a57842.tar.bz2
xen-9f6d07bac9f14aaa8bafe38b4a217e61a3a57842.zip
tools: get rid of hardcoded config dirs
Remove *all* hardcoded "/etc/xen" strings in python code. Additionally, it removes pygrub_path from osdep.py. Its use has been replaced with auxbin.pathTo("pygrub"). Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
Diffstat (limited to 'config')
-rw-r--r--config/StdGNU.mk8
-rw-r--r--config/SunOS.mk8
2 files changed, 16 insertions, 0 deletions
diff --git a/config/StdGNU.mk b/config/StdGNU.mk
index 812d389a28..4ad4e3f580 100644
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -40,6 +40,14 @@ SBINDIR = $(PREFIX)/sbin
PRIVATE_PREFIX = $(LIBDIR)/xen
PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin
+ifeq ($(PREFIX),/usr)
+CONFIG_DIR = /etc
+else
+CONFIG_DIR = $(PREFIX)/etc
+endif
+XEN_CONFIG_DIR = $(CONFIG_DIR)/xen
+XEN_SCRIPT_DIR = $(XEN_CONFIG_DIR)/scripts
+
SOCKET_LIBS =
CURSES_LIBS = -lncurses
PTHREAD_LIBS = -lpthread
diff --git a/config/SunOS.mk b/config/SunOS.mk
index 61fa489c27..d1f315bad3 100644
--- a/config/SunOS.mk
+++ b/config/SunOS.mk
@@ -34,6 +34,14 @@ SBINDIR = $(PREFIX)/sbin
PRIVATE_PREFIX = $(LIBDIR)/xen
PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin
+ifeq ($(PREFIX),/usr)
+CONFIG_DIR = /etc
+else
+CONFIG_DIR = $(PREFIX)/etc
+endif
+XEN_CONFIG_DIR = $(CONFIG_DIR)/xen
+XEN_SCRIPT_DIR = $(PRIVATE_PREFIX)/scripts
+
SunOS_LIBDIR = /usr/sfw/lib
SunOS_LIBDIR_x86_64 = /usr/sfw/lib/amd64