Fri Feb 23 12:45:08 IST 2007 Mark McLoughlin <markmc@redhat.com>

        * qemud/Makefile.am: install libvirt_qemud in /usr/sbin
        instead of /usr/libexec

        * src/Makefile.am, src/qemu_internal.c: pass the correct
        path to libvirt

diff --git a/ChangeLog b/ChangeLog
index dacdc51514e0a52be4bd1f147f8d964a4d8e52f6..b021522163b230a8d95a2d33544eceaf2fa7dbbd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Feb 23 12:45:08 IST 2007 Mark McLoughlin <markmc@redhat.com>
+
+       * qemud/Makefile.am: install libvirt_qemud in /usr/sbin
+       instead of /usr/libexec
+       
+       * src/Makefile.am, src/qemu_internal.c: pass the correct
+       path to libvirt
+       
 Fri Feb 23 10:26:24 IST 2007 Mark McLoughlin <markmc@redhat.com>
 
        * src/virsh.c: in "start" and "net-start" use e.g.

diff --git a/qemud/Makefile.am b/qemud/Makefile.am
index 7c21ab7e35969a1b39a60aad7cbf3013f53e1b4e..0a70b188c2b2a9c11b44dcc8a3a31297edabb047 100644 (file)
--- a/qemud/Makefile.am
+++ b/qemud/Makefile.am
@@ -2,7 +2,7 @@
 
 INCLUDES = @LIBXML_CFLAGS@
 
-libexec_PROGRAMS = libvirt_qemud
+sbin_PROGRAMS = libvirt_qemud
 
 libvirt_qemud_SOURCES = qemud.c internal.h protocol.h \
                 driver.c driver.h \

diff --git a/src/Makefile.am b/src/Makefile.am
index 69546b63fc220d93e2de2cd8ec0c32ead8c628bb..f08038103b52f6e21273e2226718aa27cc7ab983 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 INCLUDES = -I$(top_builddir)/include -I@top_srcdir@/include @LIBXML_CFLAGS@ -I@top_srcdir@/qemud \
-          -DBINDIR=\""$(libexecdir)"\" -DLOCALEBASEDIR=\""$(datadir)/locale"\" \
+          -DBINDIR=\""$(libexecdir)"\" -DSBINDIR=\""$(sbindir)"\" -DLOCALEBASEDIR=\""$(datadir)/locale"\" \
            -DLOCAL_STATE_DIR=\""$(localstatedir)"\" \
            -DGETTEXT_PACKAGE=\"$(PACKAGE)\"
 DEPS = libvirt.la

diff --git a/src/qemu_internal.c b/src/qemu_internal.c
index 19ff45c14d12329c45e2ac9985120d7a405fd8f1..0c60582ec828bc6b89117307ea29a12fe98b0c43 100644 (file)
--- a/src/qemu_internal.c
+++ b/src/qemu_internal.c
@@ -99,8 +99,8 @@ static const char *
 qemuFindServerPath(void)
 {
     static const char *serverPaths[] = {
-        BINDIR "/libvirt_qemud",
-        BINDIR "/libvirt_qemud_dbg",
+        SBINDIR "/libvirt_qemud",
+        SBINDIR "/libvirt_qemud_dbg",
         NULL
     };
     int i;