From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <Ian.Campbell@citrix.com>
Subject: Re: [PATCH 15/28] Use configure --libexecdir=BASEDIR to
	set LIBEXEC
Date: Mon, 6 Oct 2014 16:40:28 +0100
Message-ID: <1412610028.14255.19.camel@citrix.com>
References: <1412181690-19609-1-git-send-email-olaf@aepfle.de>
	<1412181690-19609-16-git-send-email-olaf@aepfle.de>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1412181690-19609-16-git-send-email-olaf@aepfle.de>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Olaf Hering <olaf@aepfle.de>
Cc: Wei Liu <wei.liu2@citrix.com>, George Dunlap <george.dunlap@eu.citrix.com>, Stefano Stabellini <stefano.stabellini@eu.citrix.com>, Ian Jackson <ian.jackson@eu.citrix.com>, xen-devel@lists.xen.org, Samuel Thibault <samuel.thibault@ens-lyon.org>
List-Id: xen-devel@lists.xenproject.org

On Wed, 2014-10-01 at 18:41 +0200, Olaf Hering wrote:
> Most users of LIBEXEC are updated to use LIBEXEC_BIN because that is
> what they want.

This caused the qemu-dm binary to move from
dist/install/usr/local/lib/xen/bin/qemu-dm has become
dist/install/usr/local/lib/xen/qemu-dm, because you missed the hidden
reliance on LIBEXEC inside the qemu-trad tree.

I propose that Ian J reviews and applies the following and I will fold
the associated Config.mk change into this changeset.

I've done builds locally for both x86_32 and x86_64 and it has put
qemu-dm back where it belongs...

Ian.

>>From 6e0f43aa9d7af043347abe2ddbdf0e1eb0dbff0c Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Mon, 6 Oct 2014 16:24:46 +0100
Subject: [PATCH] qemu-xen-trad: Switch to $(LIBEXEC_BIN) from $(LIBEXEC)

The meaning of LIBEXEC in the Xen build system has been made to
follow the more conventional meaning.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 xen-config.mak    |    2 +-
 xen-setup-stubdom |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen-config.mak b/xen-config.mak
index 77fef4f..280af0c 100644
--- a/xen-config.mak
+++ b/xen-config.mak
@@ -9,4 +9,4 @@ CONFIG_SOFTMMU=yes
 
 CFLAGS += -I$(QEMU_ROOT)/hw
 
-bindir = ${LIBEXEC}
+bindir = ${LIBEXEC_BIN}
diff --git a/xen-setup-stubdom b/xen-setup-stubdom
index 4f1b081..b523509 100755
--- a/xen-setup-stubdom
+++ b/xen-setup-stubdom
@@ -22,7 +22,7 @@ TARGET_CPPFLAGS += $TARGET_CPPFLAGS -DCONFIG_STUBDOM
-D__XEN_TOOLS__
 TARGET_CFLAGS= $TARGET_CFLAGS
 TARGET_LDFLAGS= $TARGET_LDFLAGS
 
-bindir = \${LIBEXEC}
+bindir = \${LIBEXEC_BIN}
 END
 mv -f $target/config.mak.new $target/config.mak
 #----------
-- 
1.7.10.4