aboutsummaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorOlaf Hering <olaf@aepfle.de>2014-04-23 15:08:51 +0200
committerJan Beulich <jbeulich@suse.com>2014-04-23 15:08:51 +0200
commit6475d700055fa952f7671cee982a23de2f5e4a7c (patch)
treed6096d501e8d9e43636419174a0ca3b935b141e6 /config
parentcc01bd72a1ce1170d15e2b6edd888781ffee8596 (diff)
downloadxen-6475d700055fa952f7671cee982a23de2f5e4a7c.tar.gz
use BOOT_DIR as xen.gz install location
Xen is currently installed into /boot, which is a hardcoded path. This makes it impossible to install two xen.rpm packages from 'make rpmball' in parallel because rpm complains about conflicting files. Use BOOT_DIR to define the install path to make it possible to install xen.gz below --prefix=. Signed-off-by: Olaf Hering <olaf@aepfle.de> Reviewed-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'config')
-rw-r--r--config/StdGNU.mk2
-rw-r--r--config/SunOS.mk2
2 files changed, 4 insertions, 0 deletions
diff --git a/config/StdGNU.mk b/config/StdGNU.mk
index 25fc59413c..c6439f6e13 100644
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -51,6 +51,8 @@ SYSCONFIG_DIR = $(CONFIG_DIR)/$(CONFIG_LEAF_DIR)
XEN_CONFIG_DIR = $(CONFIG_DIR)/xen
XEN_SCRIPT_DIR = $(XEN_CONFIG_DIR)/scripts
+BOOT_DIR ?= /boot
+
SOCKET_LIBS =
UTIL_LIBS = -lutil
DLOPEN_LIBS = -ldl
diff --git a/config/SunOS.mk b/config/SunOS.mk
index 2c528b7dc4..50c60fe3e5 100644
--- a/config/SunOS.mk
+++ b/config/SunOS.mk
@@ -39,6 +39,8 @@ endif
XEN_CONFIG_DIR = $(CONFIG_DIR)/xen
XEN_SCRIPT_DIR = $(PRIVATE_PREFIX)/scripts
+BOOT_DIR ?= /boot
+
SunOS_LIBDIR = /usr/sfw/lib
SunOS_LIBDIR_x86_64 = /usr/sfw/lib/amd64