From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id D45DA6DE12DD for ; Mon, 21 Nov 2016 13:15:56 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" X-Spam-Flag: NO X-Spam-Score: -0.2 X-Spam-Level: X-Spam-Status: No, score=-0.2 tagged_above=-999 required=5 tests=[AWL=-0.180, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Dtp22DvcUBy9 for ; Mon, 21 Nov 2016 13:15:56 -0800 (PST) Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) by arlo.cworth.org (Postfix) with ESMTPS id 8B4896DE12C1 for ; Mon, 21 Nov 2016 13:15:49 -0800 (PST) Received: by mail-qk0-f193.google.com with SMTP id h201so50082057qke.3 for ; Mon, 21 Nov 2016 13:15:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nikula-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=DWJ8tdQq6ysbseMyYUIRV7X8WIizIEO0pzFoZE9kHpI=; b=vU5WjcuFnNePbsLFqPz7Gzn6cOOVW6xjpydrb7qNzEJKia46VpI9EwxU/WlTO5s9oo YOteVbyqJCWP8RcRCEMRH6KZsgOtPFrvF0dJhhjMTRhw/Gvps3sXBK8m56rBdclzFKGM GPbdti6Mg6uV+Ea2b3TSYWAVA6Yypk5QNNmcuknmvOIufDHQLMiUNdp2N2u+q4B4yLDn 7dhuQQDfZgmApbBHbgd1IVxLLnn7JQ/Wvq/LHounK+yqN/2PeLdeaTbVpUWG1xdehuVu FxSisd48nQMmlCkIEAhUVxoRvloeoEQPRG+2B5NwR1zRNFtG8pNukkp3kXWJZYgq75Zs D/aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=DWJ8tdQq6ysbseMyYUIRV7X8WIizIEO0pzFoZE9kHpI=; b=ICZq2q0tWtLiNrrrzRBOCaZfVtsNyaNP5t7KkeEOYDPPVF3Dnp9y56ubfqdbG7lEtQ 9W0CxJ+tSrrYa9Kl4P8UiFoyr11MZCE2pMS/HoVxZlBTrllGoi6adOfhYGacMM3kxPzz yNCidhz5kTTjkIJ461K+/6p13TZao/qvXkRmGfiLYn9Y0JZYxtaiKaKlqgWGumq6QZai nJ+0e+aFoIrjjxxa4TvI+tdN//RmZlBo1NZA5bSdhFC44CD88kp5fqFXA03zEq92X+Ya fKMcARklVM/mZrIk+Zhmz51lH8ytyAVYmeE+jo8xtYZaGQr+7YpSdctfk+KRKtpndCiQ J+dw== X-Gm-Message-State: AKaTC00uyVoswknZOKVknSrxYslXDJpz51nkXsGthFgoIbilmgJUSJ2ZZoRy2HYqYVRRZA== X-Received: by 10.46.5.215 with SMTP id 206mr9693368ljf.17.1479762948281; Mon, 21 Nov 2016 13:15:48 -0800 (PST) Received: from localhost (mobile-access-bcee98-78.dhcp.inet.fi. [188.238.152.78]) by smtp.gmail.com with ESMTPSA id s127sm764904lja.31.2016.11.21.13.15.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Nov 2016 13:15:47 -0800 (PST) From: Jani Nikula To: notmuch@notmuchmail.org Subject: [PATCH v2 8/9] build: install notmuch-emacs-mua.desktop file with emacs Date: Mon, 21 Nov 2016 23:13:40 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Nov 2016 21:15:56 -0000 There is really no need to have a separate install target for the desktop file. Just install the desktop file with emacs, with a configure option to opt out. --- configure | 13 +++++++++++++ emacs/Makefile.local | 5 ++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/configure b/configure index f0fc466eead5..27afc8076c81 100755 --- a/configure +++ b/configure @@ -70,6 +70,7 @@ LIBDIR= WITH_DOCS=1 WITH_API_DOCS=1 WITH_EMACS=1 +WITH_DESKTOP=1 WITH_BASH=1 WITH_RUBY=1 WITH_ZSH=1 @@ -141,6 +142,7 @@ Some features can be disabled (--with-feature=no is equivalent to --without-docs Do not install documentation --without-api-docs Do not install API man page --without-emacs Do not install lisp file + --without-desktop Do not install desktop file --without-ruby Do not install ruby bindings --without-zsh-completion Do not install zsh completions files --without-retry-lock Do not use blocking xapian opens, even if available @@ -209,6 +211,14 @@ for option; do fi elif [ "${option}" = '--without-emacs' ] ; then WITH_EMACS=0 + elif [ "${option%%=*}" = '--with-desktop' ]; then + if [ "${option#*=}" = 'no' ]; then + WITH_DESKTOP=0 + else + WITH_DESKTOP=1 + fi + elif [ "${option}" = '--without-desktop' ] ; then + WITH_DESKTOP=0 elif [ "${option%%=*}" = '--with-bash-completion' ]; then if [ "${option#*=}" = 'no' ]; then WITH_BASH=0 @@ -1123,6 +1133,9 @@ VALGRIND_CFLAGS = ${valgrind_cflags} # Support for emacs WITH_EMACS = ${WITH_EMACS} +# Support for desktop file +WITH_DESKTOP = ${WITH_DESKTOP} + # Support for bash completion WITH_BASH = ${WITH_BASH} diff --git a/emacs/Makefile.local b/emacs/Makefile.local index b47577ac1110..ffa8421ebd45 100644 --- a/emacs/Makefile.local +++ b/emacs/Makefile.local @@ -96,10 +96,9 @@ endif install -m0644 $(emacs_images) "$(DESTDIR)$(emacsetcdir)" mkdir -p "$(DESTDIR)$(prefix)/bin/" install $(emacs_mua) "$(DESTDIR)$(prefix)/bin" - -.PHONY: install-desktop -install-desktop: +ifeq ($(WITH_DESKTOP),1) mkdir -p "$(DESTDIR)$(desktop_dir)" desktop-file-install --mode 0644 --dir "$(DESTDIR)$(desktop_dir)" $(emacs_mua_desktop) +endif CLEAN := $(CLEAN) $(emacs_bytecode) $(dir)/notmuch-version.el $(dir)/notmuch-pkg.el -- 2.1.4