|
 |
60475e |
From 04b632e6de14ec0336e14988bf4c2bd581f7308e Mon Sep 17 00:00:00 2001
|
|
|
60475e |
From: Petr Lautrbach <plautrba@redhat.com>
|
|
|
60475e |
Date: Tue, 5 Mar 2019 17:25:00 +0100
|
|
|
c33c08 |
Subject: [PATCH] gui: Install .desktop files to /usr/share/applications by
|
|
|
c33c08 |
default
|
|
|
60475e |
|
|
|
60475e |
/usr/share/applications is a standard directory for .desktop files.
|
|
|
60475e |
Installation path can be changed using DESKTOPDIR variable in installation
|
|
|
60475e |
phase, e.g.
|
|
|
60475e |
|
|
|
60475e |
make DESKTOPDIR=/usr/local/share/applications install
|
|
|
60475e |
|
|
|
60475e |
Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
|
|
|
60475e |
---
|
|
|
60475e |
gui/Makefile | 4 +++-
|
|
|
60475e |
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
60475e |
|
|
|
60475e |
diff --git a/gui/Makefile b/gui/Makefile
|
|
|
60475e |
index b2375fbf..ca965c94 100644
|
|
|
60475e |
--- a/gui/Makefile
|
|
|
60475e |
+++ b/gui/Makefile
|
|
|
60475e |
@@ -5,6 +5,7 @@ BINDIR ?= $(PREFIX)/bin
|
|
|
60475e |
SHAREDIR ?= $(PREFIX)/share/system-config-selinux
|
|
|
60475e |
DATADIR ?= $(PREFIX)/share
|
|
|
60475e |
MANDIR ?= $(PREFIX)/share/man
|
|
|
60475e |
+DESKTOPDIR ?= $(PREFIX)/share/applications
|
|
|
60475e |
|
|
|
60475e |
TARGETS= \
|
|
|
60475e |
booleansPage.py \
|
|
|
60475e |
@@ -29,6 +30,7 @@ install: all
|
|
|
60475e |
-mkdir -p $(DESTDIR)$(DATADIR)/pixmaps
|
|
|
60475e |
-mkdir -p $(DESTDIR)$(DATADIR)/icons/hicolor/24x24/apps
|
|
|
60475e |
-mkdir -p $(DESTDIR)$(DATADIR)/polkit-1/actions/
|
|
|
60475e |
+ -mkdir -p $(DESTDIR)$(DESKTOPDIR)
|
|
|
60475e |
install -m 755 system-config-selinux.py $(DESTDIR)$(SHAREDIR)
|
|
|
60475e |
install -m 755 system-config-selinux $(DESTDIR)$(BINDIR)
|
|
|
60475e |
install -m 755 polgengui.py $(DESTDIR)$(BINDIR)/selinux-polgengui
|
|
|
60475e |
@@ -44,7 +46,7 @@ install: all
|
|
|
60475e |
install -m 644 system-config-selinux.png $(DESTDIR)$(DATADIR)/pixmaps
|
|
|
60475e |
install -m 644 system-config-selinux.png $(DESTDIR)$(DATADIR)/icons/hicolor/24x24/apps
|
|
|
60475e |
install -m 644 system-config-selinux.png $(DESTDIR)$(DATADIR)/system-config-selinux
|
|
|
60475e |
- install -m 644 *.desktop $(DESTDIR)$(DATADIR)/system-config-selinux
|
|
|
60475e |
+ install -m 644 *.desktop $(DESTDIR)$(DESKTOPDIR)
|
|
|
60475e |
-mkdir -p $(DESTDIR)$(DATADIR)/pixmaps
|
|
|
60475e |
install -m 644 sepolicy_256.png $(DESTDIR)$(DATADIR)/pixmaps/sepolicy.png
|
|
|
60475e |
for i in 16 22 32 48 256; do \
|
|
|
60475e |
--
|
|
|
60475e |
2.21.0
|
|
|
60475e |
|