From c0dc8a23e95ecee2c861b19789c32bd5b2a564de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sun, 5 Mar 2017 00:58:00 +0100 Subject: Install status SVG icons in hicolor theme Added a FIXME as this icon management really needs a big cleanup. --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 55008c6..5f0b417 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,7 @@ libexecdir=/usr/libexec desktopdir=/usr/share/applications autostartdir=/etc/xdg/autostart iconsdir=/usr/lib/libDrakX/icons +scalableiconsdir=/usr/share/icons/hicolor/scalable/actions pixmapsdir=/usr/share/libDrakX/pixmaps USER_TOOLS=net_applet @@ -25,7 +26,7 @@ check: @for p in bin/*; do perl -cw $$p || exit 1; done install: - install -d $(DESTDIR){$(libdir),$(bindir),$(libexecdir),$(desktopdir),$(autostartdir),$(iconsdir),$(pixmapsdir)} + install -d $(DESTDIR){$(libdir),$(bindir),$(libexecdir),$(desktopdir),$(autostartdir),$(iconsdir),$(pixmapsdir),$(scalableiconsdir)} cp -a lib/* $(DESTDIR)$(libdir)/libDrakX/ find $(DESTDIR) -name .perl_checker -exec rm {} \; (cd bin && \ @@ -35,6 +36,10 @@ install: install -m644 $(wildcard data/*.desktop) $(DESTDIR)$(desktopdir) install -m644 $(wildcard data/icons/*.png) $(DESTDIR)$(iconsdir) install -m644 $(wildcard data/pixmaps/*.png) $(DESTDIR)$(pixmapsdir) + # FIXME: Unify install locations for drakx icons + for icon in connected disconnected unconfigured connecting; do \ + install -m644 data/pixmaps/svg/$$icon.svg $(DESTDIR)$(scalableiconsdir)/$(NAME)-$$icon.svg; \ + done perl -pe 's/\s+--force//g' $(DESTDIR)$(desktopdir)/net_applet.desktop > $(DESTDIR)$(autostartdir)/net_applet.desktop make -C po install make -C polkit install -- cgit v1.2.1