diff options
Diffstat (limited to 'tools/examples')
| -rw-r--r-- | tools/examples/Makefile | 8 | ||||
| -rw-r--r-- | tools/examples/xmexample.vmx.in (renamed from tools/examples/xmexample.vmx) | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/tools/examples/Makefile b/tools/examples/Makefile index 36edb8789f..5bfa67fd9f 100644 --- a/tools/examples/Makefile +++ b/tools/examples/Makefile @@ -25,7 +25,7 @@ XEN_SCRIPTS += block-phy XEN_SCRIPTS += block-file XEN_SCRIPTS += block-enbd -XEN_BOOT_DIR = /usr/lib/xen/boot +XEN_BOOT_DIR = /usr/$(LIBDIR)/xen/boot XEN_BOOT = mem-map.sxp XEN_HOTPLUG_DIR = /etc/hotplug @@ -37,12 +37,15 @@ build: install: all install-initd install-configs install-scripts install-boot \ install-hotplug +xmexample.vmx: xmexample.vmx.in + sed -e 's/@@LIBDIR@@/$(LIBDIR)/' < $< > $@ + install-initd: [ -d $(DESTDIR)/etc/init.d ] || $(INSTALL_DIR) $(DESTDIR)/etc/init.d $(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)/etc/init.d $(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)/etc/init.d -install-configs: +install-configs: $(XEN_CONFIGS) [ -d $(DESTDIR)$(XEN_CONFIG_DIR) ] || \ $(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR) [ -d $(DESTDIR)$(XEN_CONFIG_DIR)/auto ] || \ @@ -77,3 +80,4 @@ install-hotplug: done clean: + $(RM) xmexample.vmx diff --git a/tools/examples/xmexample.vmx b/tools/examples/xmexample.vmx.in index 1c338beca4..c45a237033 100644 --- a/tools/examples/xmexample.vmx +++ b/tools/examples/xmexample.vmx.in @@ -8,7 +8,7 @@ #---------------------------------------------------------------------------- # Kernel image file. -kernel = "/usr/lib/xen/boot/vmxloader" +kernel = "/usr/@@LIBDIR@@/xen/boot/vmxloader" # The domain build function. VMX domain uses 'vmx'. builder='vmx' @@ -48,10 +48,10 @@ disk = [ 'file:/var/images/min-el3-i386.img,ioemu:hda,w' ] # New stuff -device_model = '/usr/lib/xen/bin/qemu-dm' +device_model = '/usr/@@LIBDIR@@/xen/bin/qemu-dm' # Advanced users only. Don't touch if you don't know what you're doing -memmap = '/usr/lib/xen/boot/mem-map.sxp' +memmap = '/usr/@@LIBDIR@@/xen/boot/mem-map.sxp' #----------------------------------------------------------------------------- # Disk image for |