From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52318) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZWqUG-0000jY-Sn for qemu-devel@nongnu.org; Tue, 01 Sep 2015 14:40:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZWqUE-0000JO-LA for qemu-devel@nongnu.org; Tue, 01 Sep 2015 14:40:52 -0400 Received: from e34.co.us.ibm.com ([32.97.110.152]:42204) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZWqUE-0000H8-2E for qemu-devel@nongnu.org; Tue, 01 Sep 2015 14:40:50 -0400 Received: from /spool/local by e34.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 1 Sep 2015 12:40:49 -0600 Received: from b03cxnp08025.gho.boulder.ibm.com (b03cxnp08025.gho.boulder.ibm.com [9.17.130.17]) by d03dlp01.boulder.ibm.com (Postfix) with ESMTP id A22BF1FF0041 for ; Tue, 1 Sep 2015 12:31:56 -0600 (MDT) Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by b03cxnp08025.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t81IdhvK41353234 for ; Tue, 1 Sep 2015 11:39:43 -0700 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t81IekDP027313 for ; Tue, 1 Sep 2015 12:40:47 -0600 From: Michael Roth Date: Tue, 1 Sep 2015 13:38:44 -0500 Message-Id: <1441132743-26228-8-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1441132743-26228-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1441132743-26228-1-git-send-email-mdroth@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 07/26] qemu-ga: Fixed paths issue with MSI build List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Leonid Bloch , Michael Roth From: Leonid Bloch Previously, if building out-of-tree, the MSI build would fail since it wasn't able to find the needed files. Signed-off-by: Leonid Bloch Reviewed-by: Marc-André Lureau * fixed up commit msg formating Signed-off-by: Michael Roth --- Makefile | 4 ++-- qga/installer/qemu-ga.wxs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 9a4c3c6..f98a554 100644 --- a/Makefile +++ b/Makefile @@ -305,8 +305,8 @@ endif $(QEMU_GA_MSI): config-host.mak -$(QEMU_GA_MSI): qga/installer/qemu-ga.wxs - $(call quiet-command,QEMU_GA_VERSION="$(QEMU_GA_VERSION)" QEMU_GA_MANUFACTURER="$(QEMU_GA_MANUFACTURER)" QEMU_GA_DISTRO="$(QEMU_GA_DISTRO)" \ +$(QEMU_GA_MSI): $(SRC_PATH)/qga/installer/qemu-ga.wxs + $(call quiet-command,QEMU_GA_VERSION="$(QEMU_GA_VERSION)" QEMU_GA_MANUFACTURER="$(QEMU_GA_MANUFACTURER)" QEMU_GA_DISTRO="$(QEMU_GA_DISTRO)" BUILD_DIR="$(BUILD_DIR)" \ wixl -o $@ $(QEMU_GA_MSI_ARCH) $(QEMU_GA_MSI_WITH_VSS) $(QEMU_GA_MSI_MINGW_DLL_PATH) $<, " WIXL $@") else msi: diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs index c195b4b..6804f02 100644 --- a/qga/installer/qemu-ga.wxs +++ b/qga/installer/qemu-ga.wxs @@ -66,7 +66,7 @@ - + - + - + -- 1.9.1