From patchwork Thu Dec 19 12:23:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213345 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="ggHHCtsI"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47dsDC0g47z9sPc for ; Thu, 19 Dec 2019 23:50:19 +1100 (AEDT) Received: from localhost ([::1]:40404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihvFw-00076a-IE for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:50:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36425) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihus6-0000eY-L6 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihus4-0002rr-Rd for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:38 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:38157 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihus2-0002oa-Tp for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AlyXS8W7jZG4G49HK6DELfSaAvnHNqjMCw5GQGS2QZo=; b=ggHHCtsIPkp1tM5kZD2N0kpSKitcojZSGuQ7Jht5GG6ghNklxNEg5SSBCyGsOK9BryKBxL bN7gHbr0H9DJ7NUQR+wbkYZ+1palUMqJJ0FWM4E1D84aG6in2CHtU5ivu1S0WUTTiysxXv 9RkCE29eMnAUDq35qngZWn7KSj2OhJQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-196--FK_vlH0NwGBG0e6F630-Q-1; Thu, 19 Dec 2019 07:25:31 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E40D4DB61 for ; Thu, 19 Dec 2019 12:25:30 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F1F560C81; Thu, 19 Dec 2019 12:25:26 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 125/132] meson: install desktop file Date: Thu, 19 Dec 2019 13:23:45 +0100 Message-Id: <1576758232-12439-34-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: -FK_vlH0NwGBG0e6F630-Q-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 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: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile | 2 -- ui/meson.build | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 04a7d00..8ebaacf 100644 --- a/Makefile +++ b/Makefile @@ -240,8 +240,6 @@ ifneq ($(vhost-user-json-y),) $(INSTALL_DATA) $$x "$(DESTDIR)$(qemu_datadir)/vhost-user/"; \ done endif - $(INSTALL_DATA) $(SRC_PATH)/ui/qemu.desktop \ - "$(DESTDIR)$(qemu_desktopdir)/qemu.desktop" ifdef CONFIG_GTK $(MAKE) -C po $@ endif diff --git a/ui/meson.build b/ui/meson.build index 22923e3..e8b94ca 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -109,4 +109,6 @@ endforeach subdir('shader') subdir('icons') +install_data('qemu.desktop', install_dir: config_host['qemu_desktopdir']) + modules += {'ui': ui_modules}