Move sepolicy desktop and png files to gui.

Signed-off-by: Stephen Smalley <[email protected]>
Androidacy · Nov 16, 2016 · 50be5fc · 50be5fc
1 parent eeba595
commit 50be5fc
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 7 deletions.
diff --git a/gui/Makefile b/gui/Makefile
@@ -42,6 +42,12 @@ install: all
 	install -m 644 system-config-selinux.png $(DATADIR)/icons/hicolor/24x24/apps
 	install -m 644 system-config-selinux.png $(DATADIR)/system-config-selinux
 	install -m 644 *.desktop $(DATADIR)/system-config-selinux
+	-mkdir -p $(DESTDIR) $(DATADIR)/pixmaps
+	install -m 644 sepolicy_256.png $(DATADIR)/pixmaps/sepolicy.png
+	for i in 16 22 32 48 256; do \
+		mkdir -p $(DESTDIR) $(DATADIR)/icons/hicolor/$${i}x$${i}/apps; \
+		install -m 644 sepolicy_$${i}.png $(DATADIR)/icons/hicolor/$${i}x$${i}/apps/sepolicy.png; \
+	done
 	install -m 644 org.selinux.config.policy $(DATADIR)/polkit-1/actions/
 clean:
 

diff --git a/python/sepolicy/sepolicy.desktop → gui/sepolicy.desktop b/python/sepolicy/sepolicy.desktop → gui/sepolicy.desktop
diff --git a/python/sepolicy/sepolicy_16.png → gui/sepolicy_16.png b/python/sepolicy/sepolicy_16.png → gui/sepolicy_16.png
diff --git a/python/sepolicy/sepolicy_22.png → gui/sepolicy_22.png b/python/sepolicy/sepolicy_22.png → gui/sepolicy_22.png
diff --git a/python/sepolicy/sepolicy_256.png → gui/sepolicy_256.png b/python/sepolicy/sepolicy_256.png → gui/sepolicy_256.png
diff --git a/python/sepolicy/sepolicy_32.png → gui/sepolicy_32.png b/python/sepolicy/sepolicy_32.png → gui/sepolicy_32.png
diff --git a/python/sepolicy/sepolicy_48.png → gui/sepolicy_48.png b/python/sepolicy/sepolicy_48.png → gui/sepolicy_48.png
diff --git a/python/sepolicy/Makefile b/python/sepolicy/Makefile
@@ -40,12 +40,5 @@ install:
 	install -m 644 *.8 $(MANDIR)/man8
 	-mkdir -p $(BASHCOMPLETIONDIR)
 	install -m 644 $(BASHCOMPLETIONS) $(BASHCOMPLETIONDIR)/sepolicy
-	install -m 644 *.desktop $(DATADIR)/system-config-selinux
-	-mkdir -p $(DESTDIR) $(DATADIR)/pixmaps
-	install -m 644 sepolicy_256.png $(DATADIR)/pixmaps/sepolicy.png
-	for i in 16 22 32 48 256; do \
-		mkdir -p $(DESTDIR) $(DATADIR)/icons/hicolor/$${i}x$${i}/apps; \
-		install -m 644 sepolicy_$${i}.png $(DATADIR)/icons/hicolor/$${i}x$${i}/apps/sepolicy.png; \
-	done
 
 relabel: