[Xen-changelog] [xen-unstable] xenstored: Always build and install.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1273229118 -3600
# Node ID caea94988515a3e0fdddbc51f380921687fcbb06
# Parent  891f9a0cf760401231796421d503aa6c0dfc83fe
xenstored: Always build and install.

It coexists quite happily with oxenstored.

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/xenstore/Makefile |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff -r 891f9a0cf760 -r caea94988515 tools/xenstore/Makefile
--- a/tools/xenstore/Makefile   Fri May 07 10:02:14 2010 +0100
+++ b/tools/xenstore/Makefile   Fri May 07 11:45:18 2010 +0100
@@ -26,10 +26,7 @@ xenstore xenstore-control: CFLAGS += -st
 xenstore xenstore-control: CFLAGS += -static
 endif
 
-ALL_TARGETS = libxenstore.so libxenstore.a clients xs_tdb_dump 
-ifneq ($(CONFIG_OCAML_XENSTORED),y)
- ALL_TARGETS += xenstored
-endif
+ALL_TARGETS = libxenstore.so libxenstore.a clients xs_tdb_dump xenstored
 
 .PHONY: all
 all: $(ALL_TARGETS)
@@ -98,6 +95,9 @@ install: all
        $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
        $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
        $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+       $(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
+       $(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
+       $(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR)
        $(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR)
        $(INSTALL_PROG) xenstore $(DESTDIR)$(BINDIR)
        set -e ; for c in $(CLIENTS) ; do \

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog