diff options
| author | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2010-09-22 17:52:34 +0100 |
|---|---|---|
| committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2010-09-22 17:52:34 +0100 |
| commit | 52bf5773ab3d9a129ca29fdf973803f63acad8dd (patch) | |
| tree | 6b4493a51bc49a02d1ea9379462f98a1482757e0 | |
| parent | 73c54d46b12f2f3fe00d1ea5327baab5173a5201 (diff) | |
| download | xen-52bf5773ab3d9a129ca29fdf973803f63acad8dd.tar.gz xen-52bf5773ab3d9a129ca29fdf973803f63acad8dd.tar.bz2 xen-52bf5773ab3d9a129ca29fdf973803f63acad8dd.zip | |
Config.mk et al: introduce XEN_LOCK_DIR
Introduce a OS dependent global variable XEN_LOCK_DIR that points at the
system directory that contains lock files.
[fixed up for conflict in Config.mk -iwj]
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
| -rw-r--r-- | Config.mk | 1 | ||||
| -rw-r--r-- | config/NetBSD.mk | 6 | ||||
| -rw-r--r-- | config/StdGNU.mk | 2 | ||||
| -rw-r--r-- | tools/libxl/libxl.h | 1 | ||||
| -rw-r--r-- | tools/libxl/libxl_paths.c | 4 |
5 files changed, 14 insertions, 0 deletions
@@ -130,6 +130,7 @@ define buildmakevars2file-closure echo "XENFIRMWAREDIR=\"$(XENFIRMWAREDIR)\"" >> $(1).tmp; \ echo "XEN_CONFIG_DIR=\"$(XEN_CONFIG_DIR)\"" >> $(1).tmp; \ echo "XEN_SCRIPT_DIR=\"$(XEN_SCRIPT_DIR)\"" >> $(1).tmp; \ + echo "XEN_LOCK_DIR=\"$(XEN_LOCK_DIR)\"" >> $(1).tmp; \ if ! cmp $(1).tmp $(1); then mv -f $(1).tmp $(1); fi endef diff --git a/config/NetBSD.mk b/config/NetBSD.mk index 73b61577c6..6245259761 100644 --- a/config/NetBSD.mk +++ b/config/NetBSD.mk @@ -7,4 +7,10 @@ LIBLEAFDIR_x86_64 = lib LIBEXEC = $(PREFIX)/libexec PRIVATE_BINDIR = $(BINDIR) +ifeq ($(PREFIX),/usr) +XEN_LOCK_DIR = /var/lib +else +XEN_LOCK_DIR = $(PREFIX)/var/lib +endif + WGET = ftp diff --git a/config/StdGNU.mk b/config/StdGNU.mk index 89267b2c48..0b1e0382d6 100644 --- a/config/StdGNU.mk +++ b/config/StdGNU.mk @@ -45,8 +45,10 @@ PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin ifeq ($(PREFIX),/usr) CONFIG_DIR = /etc +XEN_LOCK_DIR = /var/lock else CONFIG_DIR = $(PREFIX)/etc +XEN_LOCK_DIR = $(PREFIX)/var/lock endif SYSCONFIG_DIR = $(CONFIG_DIR)/$(CONFIG_LEAF_DIR) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 47ab5d253f..c1c40b1381 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -508,6 +508,7 @@ const char *libxl_private_bindir_path(void); const char *libxl_xenfirmwaredir_path(void); const char *libxl_xen_config_dir_path(void); const char *libxl_xen_script_dir_path(void); +const char *libxl_lock_dir_path(void); #endif /* LIBXL_H */ diff --git a/tools/libxl/libxl_paths.c b/tools/libxl/libxl_paths.c index b9783d7c20..9c2bd060b9 100644 --- a/tools/libxl/libxl_paths.c +++ b/tools/libxl/libxl_paths.c @@ -60,3 +60,7 @@ const char *libxl_xen_script_dir_path(void) return XEN_SCRIPT_DIR; } +const char *libxl_lock_dir_path(void) +{ + return XEN_LOCK_DIR; +} |