aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-12-03 00:18:01 -0800
committerGuy Harris <guy@alum.mit.edu>2014-12-03 08:18:31 +0000
commitd6d55b2d3c90aeac7f33eaf2a9a3c94129d82502 (patch)
tree9381003d124cf59f779383cf5e1aa2310c471288 /Makefile.am
parentb5a52eef98386d7b2aa644b80fafa02ee12445f8 (diff)
Uninstall the icons with "make uninstall".
Just in case not all shells expand {list}, create the apps/icons and apps/mimetypes directories separately; that makes it a bit clearer in any case. Change-Id: I25b3426a17a2ca7e1ce3ce1f7f9e1c650db511a7 Reviewed-on: https://code.wireshark.org/review/5578 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am11
1 files changed, 10 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 252175d292..a241dbfda0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1426,13 +1426,22 @@ patch-bzip2: distdir
install-data-local:
for size in 16 24 32 48 64 128 256; \
do \
- mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/{apps,mimetypes} ; \
+ mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps ; \
install -m 644 $(srcdir)/image/wsicon$${size}.png $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps/wireshark.png ; \
+ mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/mimetypes ; \
install -m 644 $(srcdir)/image/WiresharkDoc-$${size}.png $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/mimetypes/application-wireshark-doc.png ; \
done
mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps
install -m 644 image/wsicon.svg $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/wireshark.svg
+uninstall-local:
+ for size in 16 24 32 48 64 128 256; \
+ do \
+ rm -f $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps/wireshark.png ; \
+ rm -f $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/mimetypes/application-wireshark-doc.png ; \
+ done
+ rm -f $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/wireshark.svg
+
# Install some desktop files (for use with GNOME, KDE, or any other freedesktop.org-compliant desktops)
# No, these do not go into $(datarootdir): the desktop won't look for them there.
# Yes, that violate's autofoo's principle of relocatability.