From 2f4ecf3b6acad46a30c0fa73e58b34291f3e7322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Fri, 3 Mar 2017 22:46:28 +0100
Subject: Install and use SVG icons by default

Move the mgaonline icon in the hicolor theme with the proper SVG
variant installed too.
Also fixed a typo in a rpmdrake icon and updated copyright year.
---
 Makefile | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index d0b19192..c7ead352 100644
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,8 @@ SUBDIRS = po polkit
 
 PREFIX = /
 DATADIR = $(PREFIX)/usr/share
+PKGDATADIR = $(DATADIR)/$(NAME)
 ICONSDIR = $(DATADIR)/icons
-PIXDIR = $(DATADIR)/$(NAME)
 LIBEXECDIR = $(PREFIX)/usr/libexec
 BINDIR = $(PREFIX)/usr/bin
 FBLIBDIR = $(PREFIX)/usr/lib/libDrakX/drakfirsttime
@@ -30,15 +30,18 @@ clean:
 	find . -name '*~' | xargs rm -f
 
 install: all
-	install -d $(PREFIX)/usr/{bin,libexec,share/{mime/packages,$(NAME)/pixmaps,autostart,gnome/autostart,icons/{mini,large}},lib/libDrakX/drakfirsttime}
+	install -d $(PREFIX)/usr/{bin,libexec,share/{mime/packages,$(NAME)/icons,autostart,gnome/autostart,icons},lib/libDrakX/drakfirsttime}
 	install -m755 $(MGAUPDATE) $(MGAAPPLET)-config $(MGAAPPLET)-upgrade-helper $(LIBEXECDIR)
 	install -m755 $(MGAAPPLET) $(MGAAPPLET)-update-checker $(BINDIR)
 	install -d $(SYSCONFDIR)
 	install -m644 mgaapplet.conf $(SYSCONFDIR)/mgaapplet
-	install -m644 icons/$(NAME)16.png $(ICONSDIR)/mini/$(NAME).png
-	install -m644 icons/$(NAME)32.png $(ICONSDIR)/$(NAME).png
-	install -m644 icons/$(NAME)48.png $(ICONSDIR)/large/$(NAME).png
-	install -m644 pixmaps/*.png $(PIXDIR)/pixmaps
+	install -D -m644 icons/$(NAME)16.png $(ICONSDIR)/hicolor/16x16/apps/$(NAME).png
+	install -D -m644 icons/$(NAME)32.png $(ICONSDIR)/hicolor/32x32/apps/$(NAME).png
+	install -D -m644 icons/$(NAME)48.png $(ICONSDIR)/hicolor/48x48/apps/$(NAME).png
+	install -D -m644 icons/$(NAME).svg $(ICONSDIR)/hicolor/scalable/apps/$(NAME).png
+	# Compat symlink, to be sure we don't break external apps relying on this icon
+	ln -s $(ICONSDIR)/hicolor/32x32/apps/$(NAME).png $(ICONSDIR)/$(NAME).png
+	install -m644 data/icons/*.svg $(PKGDATADIR)/icons
 	perl -pi -e "s/version = 1/version = '$(VERSION)'/" mgaonline.pm
 	install -m644 mgaonline.pm $(FBLIBDIR)
 	install -m644 mgaapplet.pm $(FBLIBDIR)
-- 
cgit v1.2.1