diff options
| author | Olaf Hering <olaf@aepfle.de> | 2011-11-20 17:02:43 +0100 |
|---|---|---|
| committer | Olaf Hering <olaf@aepfle.de> | 2011-11-20 17:02:43 +0100 |
| commit | 8a8d8fc344416a6ddb6472906ecebbeaafab6d2f (patch) | |
| tree | 692fd86d6ec381294205e51bd4dc5dc9866a7d5d | |
| parent | ab0be33d43ea0187599210a13fdd8f10bbcacd25 (diff) | |
| download | xen-8a8d8fc344416a6ddb6472906ecebbeaafab6d2f.tar.gz xen-8a8d8fc344416a6ddb6472906ecebbeaafab6d2f.tar.bz2 xen-8a8d8fc344416a6ddb6472906ecebbeaafab6d2f.zip | |
xenpaging: add XEN_PAGING_DIR / libxl_xenpaging_dir_path()
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
| -rw-r--r-- | Config.mk | 2 | ||||
| -rw-r--r-- | config/StdGNU.mk | 2 | ||||
| -rw-r--r-- | tools/libxl/libxl.h | 1 | ||||
| -rw-r--r-- | tools/libxl/libxl_paths.c | 5 | ||||
| -rw-r--r-- | tools/xenpaging/Makefile | 2 |
5 files changed, 10 insertions, 2 deletions
@@ -142,7 +142,7 @@ define buildmakevars2file-closure $(foreach var, \ SBINDIR BINDIR LIBEXEC LIBDIR SHAREDIR PRIVATE_BINDIR \ XENFIRMWAREDIR XEN_CONFIG_DIR XEN_SCRIPT_DIR XEN_LOCK_DIR \ - XEN_RUN_DIR, \ + XEN_RUN_DIR XEN_PAGING_DIR, \ echo "$(var)=\"$($(var))\"" >>$(1).tmp;) \ $(call move-if-changed,$(1).tmp,$(1)) endef diff --git a/config/StdGNU.mk b/config/StdGNU.mk index 68fa226884..2af2841ccc 100644 --- a/config/StdGNU.mk +++ b/config/StdGNU.mk @@ -53,10 +53,12 @@ ifeq ($(PREFIX),/usr) CONFIG_DIR = /etc XEN_LOCK_DIR = /var/lock XEN_RUN_DIR = /var/run/xen +XEN_PAGING_DIR = /var/lib/xen/xenpaging else CONFIG_DIR = $(PREFIX)/etc XEN_LOCK_DIR = $(PREFIX)/var/lock XEN_RUN_DIR = $(PREFIX)/var/run/xen +XEN_PAGING_DIR = $(PREFIX)/var/lib/xen/xenpaging endif SYSCONFIG_DIR = $(CONFIG_DIR)/$(CONFIG_LEAF_DIR) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 6ce3d83828..289dc85b7b 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -633,6 +633,7 @@ const char *libxl_xen_config_dir_path(void); const char *libxl_xen_script_dir_path(void); const char *libxl_lock_dir_path(void); const char *libxl_run_dir_path(void); +const char *libxl_xenpaging_dir_path(void); #endif /* LIBXL_H */ diff --git a/tools/libxl/libxl_paths.c b/tools/libxl/libxl_paths.c index 64f662d8a7..c84e51da0d 100644 --- a/tools/libxl/libxl_paths.c +++ b/tools/libxl/libxl_paths.c @@ -70,6 +70,11 @@ const char *libxl_run_dir_path(void) return XEN_RUN_DIR; } +const char *libxl_xenpaging_dir_path(void) +{ + return XEN_PAGING_DIR; +} + /* * Local variables: * mode: C diff --git a/tools/xenpaging/Makefile b/tools/xenpaging/Makefile index e80ae5d6a3..08230a6af5 100644 --- a/tools/xenpaging/Makefile +++ b/tools/xenpaging/Makefile @@ -23,7 +23,7 @@ xenpaging: $(OBJS) $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS) $(APPEND_LDFLAGS) install: all - $(INSTALL_DIR) $(DESTDIR)/var/lib/xen/xenpaging + $(INSTALL_DIR) $(DESTDIR)$(XEN_PAGING_DIR) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC) $(INSTALL_PROG) $(IBINS) $(DESTDIR)$(LIBEXEC) |