From 0faef1449d6718b06b5dc1c2d43de86e91e867a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sat, 4 Mar 2017 13:21:28 +0100 Subject: Move icons to hicolor theme (WIP) The transition is not complete, mgaapplet still needs fixed to lookup the icons in the theme paths and no in a hardcoded /usr/share/mgaonline --- Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c7ead352..d5cdc508 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,6 @@ SUBDIRS = po polkit PREFIX = / DATADIR = $(PREFIX)/usr/share -PKGDATADIR = $(DATADIR)/$(NAME) ICONSDIR = $(DATADIR)/icons LIBEXECDIR = $(PREFIX)/usr/libexec BINDIR = $(PREFIX)/usr/bin @@ -30,18 +29,14 @@ clean: find . -name '*~' | xargs rm -f install: all - install -d $(PREFIX)/usr/{bin,libexec,share/{mime/packages,$(NAME)/icons,autostart,gnome/autostart,icons},lib/libDrakX/drakfirsttime} + install -d $(PREFIX)/usr/{bin,libexec,share/{mime/packages,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 -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 + cp -a icons/hicolor $(ICONSDIR) # 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