selinux.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Petr Lautrbach <plautrba@redhat.com>
To: selinux@vger.kernel.org
Cc: Petr Lautrbach <plautrba@redhat.com>
Subject: [PATCH 2/2] gui: Install .desktop files to /usr/share/applications by default
Date: Tue,  5 Mar 2019 17:38:57 +0100	[thread overview]
Message-ID: <20190305163856.395-2-plautrba@redhat.com> (raw)
In-Reply-To: <20190305163856.395-1-plautrba@redhat.com>

/usr/share/applications is a standard directory for .desktop files.
Installation path can be changed using DESKTOPDIR variable in installation
phase, e.g.

make DESKTOPDIR=/usr/local/share/applications install

Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
---
 gui/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gui/Makefile b/gui/Makefile
index b2375fbf..5e64c3a1 100644
--- a/gui/Makefile
+++ b/gui/Makefile
@@ -5,6 +5,7 @@ BINDIR ?= $(PREFIX)/bin
 SHAREDIR ?= $(PREFIX)/share/system-config-selinux
 DATADIR ?= $(PREFIX)/share
 MANDIR ?= $(PREFIX)/share/man
+DESKTOPDIR ?= $(PREFIX)/share/applications
 
 TARGETS= \
 booleansPage.py \
@@ -44,7 +45,7 @@ install: all
 	install -m 644 system-config-selinux.png $(DESTDIR)$(DATADIR)/pixmaps
 	install -m 644 system-config-selinux.png $(DESTDIR)$(DATADIR)/icons/hicolor/24x24/apps
 	install -m 644 system-config-selinux.png $(DESTDIR)$(DATADIR)/system-config-selinux
-	install -m 644 *.desktop $(DESTDIR)$(DATADIR)/system-config-selinux
+	install -m 644 *.desktop $(DESTDIR)$(DESKTOPDIR)
 	-mkdir -p $(DESTDIR)$(DATADIR)/pixmaps
 	install -m 644 sepolicy_256.png $(DESTDIR)$(DATADIR)/pixmaps/sepolicy.png
 	for i in 16 22 32 48 256; do \
-- 
2.20.1


  reply	other threads:[~2019-03-05 16:39 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-21 20:31 .desktop files installed by gui/ Nicolas Iooss
2019-02-27 14:02 ` Petr Lautrbach
2019-02-28  5:14   ` Jason Zaman
2019-03-05 16:38   ` [PATCH 1/2] gui: Install polgengui.py to /usr/bin/selinux-polgengui Petr Lautrbach
2019-03-05 16:38     ` Petr Lautrbach [this message]
2019-03-17 13:35       ` [PATCH 2/2] gui: Install .desktop files to /usr/share/applications by default Nicolas Iooss
2019-03-18 13:39         ` [PATCH v2] " Petr Lautrbach
2019-03-18 15:26           ` Petr Lautrbach
2019-03-18 21:39             ` Nicolas Iooss
2019-03-26 21:22               ` Nicolas Iooss
2019-03-17 19:11     ` [PATCH 1/2] gui: Install polgengui.py to /usr/bin/selinux-polgengui Nicolas Iooss

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190305163856.395-2-plautrba@redhat.com \
    --to=plautrba@redhat.com \
    --cc=selinux@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).