From: Petr Lautrbach <plautrba@redhat.com>
To: selinux@vger.kernel.org
Subject: Re: [PATCH v2] gui: Install .desktop files to /usr/share/applications by default
Date: Mon, 18 Mar 2019 16:26:16 +0100 [thread overview]
Message-ID: <pjd8sxc5hlz.fsf@redhat.com> (raw)
In-Reply-To: <20190318133925.3387-1-plautrba@redhat.com>
Petr Lautrbach <plautrba@redhat.com> writes:
> /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>
Travis CI passed
https://travis-ci.org/bachradsusi/SELinuxProject-selinux/builds/507842594
> ---
> gui/Makefile | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/gui/Makefile b/gui/Makefile
> index b2375fbf..ca965c94 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 \
> @@ -29,6 +30,7 @@ install: all
> -mkdir -p $(DESTDIR)$(DATADIR)/pixmaps
> -mkdir -p $(DESTDIR)$(DATADIR)/icons/hicolor/24x24/apps
> -mkdir -p $(DESTDIR)$(DATADIR)/polkit-1/actions/
> + -mkdir -p $(DESTDIR)$(DESKTOPDIR)
> install -m 755 system-config-selinux.py
> $(DESTDIR)$(SHAREDIR)
> install -m 755 system-config-selinux $(DESTDIR)$(BINDIR)
> install -m 755 polgengui.py
> $(DESTDIR)$(BINDIR)/selinux-polgengui
> @@ -44,7 +46,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 \
next prev parent reply other threads:[~2019-03-18 15:26 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 ` [PATCH 2/2] gui: Install .desktop files to /usr/share/applications by default Petr Lautrbach
2019-03-17 13:35 ` Nicolas Iooss
2019-03-18 13:39 ` [PATCH v2] " Petr Lautrbach
2019-03-18 15:26 ` Petr Lautrbach [this message]
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=pjd8sxc5hlz.fsf@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).