From nobody Tue May 7 12:29:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1561432995; cv=none; d=zoho.com; s=zohoarc; b=St1UAvnF4iHwzurV1J5DZ+suTczPXzVYcXZkIYjwoKPwuN7/mJU9UrxX2tli6s/YgyfqxQA9xY0INAAn1kyaVB1dXzTHsP+w6LwvEWSaoYIG3WhsE/NlXOZAsQj/GFRjQWzEI3xSP2PUy6zbMhwks4uoT4GbXSmlAkw00bCa1eE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561432995; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=cCGEKYeDM1e1z8v4ql1XsBcEvemauHAs8YeuYklRAWI=; b=MqrlzxAEhSRemzykwuLI1dmKKj6TmWBsYxNa/uKBqdr5h5KICQ6e9WA4GcMbUV6LTV2DKYf6X8HKMzSjq5R4E9/a6cUhV62bb6oEZO/k19SnKTvhjWf+kZBSl5X8St+7JCL9cr25e4tNVf2xahL8s12TX/9wWW5kmhtwlDHp88Q= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1561432995019264.7575992352314; Mon, 24 Jun 2019 20:23:15 -0700 (PDT) Received: from localhost ([::1]:56160 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfc35-0001t4-US for importer@patchew.org; Mon, 24 Jun 2019 23:23:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38966) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfc21-00012O-RA for qemu-devel@nongnu.org; Mon, 24 Jun 2019 23:22:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hfc20-0002V8-PL for qemu-devel@nongnu.org; Mon, 24 Jun 2019 23:22:05 -0400 Received: from mga18.intel.com ([134.134.136.126]:49794) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hfc20-0002El-HF for qemu-devel@nongnu.org; Mon, 24 Jun 2019 23:22:04 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Jun 2019 20:21:46 -0700 Received: from coxu-arch-shz.sh.intel.com ([10.239.160.21]) by orsmga002.jf.intel.com with ESMTP; 24 Jun 2019 20:21:45 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,413,1557212400"; d="scan'208";a="172208174" From: Colin Xu To: qemu-devel@nongnu.org, berrange@redhat.com, kraxel@redhat.com Date: Tue, 25 Jun 2019 11:21:42 +0800 Message-Id: <20190625032142.13854-1-colin.xu@intel.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.126 Subject: [Qemu-devel] [PATCH] ui: Correct icon install path X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: colin.xu@intel.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The double slash in path will fail the installation on MINGW/MSYS. Fixes: a8260d387638 (ui: install logo icons to $prefix/share/icons) Signed-off-by: Colin Xu Reviewed-by: Daniel P. Berrang=C3=A9 --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index cfb18f152544..562205be290c 100644 --- a/Makefile +++ b/Makefile @@ -875,19 +875,19 @@ ifneq ($(DESCS),) done endif for s in $(ICON_SIZES); do \ - mkdir -p "$(DESTDIR)/$(qemu_icondir)/hicolor/$${s}/apps"; \ + mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps"; \ $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu_$${s}.png \ - "$(DESTDIR)/$(qemu_icondir)/hicolor/$${s}/apps/qemu.png"; \ + "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps/qemu.png"; \ done; \ - mkdir -p "$(DESTDIR)/$(qemu_icondir)/hicolor/32x32/apps"; \ + mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/32x32/apps"; \ $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu_32x32.bmp \ - "$(DESTDIR)/$(qemu_icondir)/hicolor/32x32/apps/qemu.bmp"; \ - mkdir -p "$(DESTDIR)/$(qemu_icondir)/hicolor/scalable/apps"; \ + "$(DESTDIR)$(qemu_icondir)/hicolor/32x32/apps/qemu.bmp"; \ + mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/scalable/apps"; \ $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu.svg \ - "$(DESTDIR)/$(qemu_icondir)/hicolor/scalable/apps/qemu.svg" - mkdir -p "$(DESTDIR)/$(qemu_desktopdir)" + "$(DESTDIR)$(qemu_icondir)/hicolor/scalable/apps/qemu.svg" + mkdir -p "$(DESTDIR)$(qemu_desktopdir)" $(INSTALL_DATA) $(SRC_PATH)/ui/qemu.desktop \ - "$(DESTDIR)/$(qemu_desktopdir)/qemu.desktop" + "$(DESTDIR)$(qemu_desktopdir)/qemu.desktop" ifdef CONFIG_GTK $(MAKE) -C po $@ endif --=20 2.22.0