diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-02-27 16:08:16 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-02-27 16:08:16 +0000 |
| commit | f9324d29e78888d860a1960c3c62dcda3cfdd420 (patch) | |
| tree | f1b01e1d6daeb5d046b475abb5fb7fba63afdc08 | |
| parent | 7465ad157238c49c5b1179243e151b4cca97a244 (diff) | |
Don't install the desktop-integration files in our (Wireshark's) data
directory (which is based on our installation prefix): there's no guarantee
that the desktop also uses the same prefix.
Add a note about how we might be able to find the desktop's data directory
should anyone actually run GNOME with a prefix other than /usr .
Also use 'desktop-file-install' to install the desktop file (if configure
found that command).
svn path=/trunk/; revision=47914
| -rw-r--r-- | Makefile.am | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index 438d348f8f..619f9082da 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1063,21 +1063,29 @@ rpm-package: dist fi # Install some desktop files (for use with GNOME and/or 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. +# What we (probably) should do is check `pkg-config --variable=prefix gtk+-2.0` to know where +# to install this stuff... install_desktop_files: - mkdir -p $(DESTDIR)/$(datarootdir)/{icons/gnome/{16x16,32x32,48x48,256x256}/mimetypes,mime/packages,applications} - install -m 644 -T wireshark-mime-package.xml $(DESTDIR)/$(datarootdir)/mime/packages/wireshark.xml - install -m 644 -T wireshark.desktop $(DESTDIR)/$(datarootdir)/applications/wireshark.desktop - mkdir -p $(DESTDIR)/$(datarootdir)/icons/hicolor/{16x16,32x32,48x48,64x64,256x256}/apps - install -m 644 image/wsicon16.png $(DESTDIR)/$(datarootdir)/icons/hicolor/16x16/apps/wireshark.png - install -m 644 image/wsicon32.png $(DESTDIR)/$(datarootdir)/icons/hicolor/32x32/apps/wireshark.png - install -m 644 image/wsicon48.png $(DESTDIR)/$(datarootdir)/icons/hicolor/48x48/apps/wireshark.png - install -m 644 image/wsicon64.png $(DESTDIR)/$(datarootdir)/icons/hicolor/64x64/apps/wireshark.png - install -m 644 image/wsicon256.png $(DESTDIR)/$(datarootdir)/icons/hicolor/256x256/apps/wireshark.png - install -m 644 -T image/WiresharkDoc-16.png $(DESTDIR)/$(datarootdir)/icons/gnome/16x16/mimetypes/application-wireshark-doc.png - install -m 644 -T image/WiresharkDoc-32.png $(DESTDIR)/$(datarootdir)/icons/gnome/32x32/mimetypes/application-wireshark-doc.png - install -m 644 -T image/WiresharkDoc-48.png $(DESTDIR)/$(datarootdir)/icons/gnome/48x48/mimetypes/application-wireshark-doc.png - install -m 644 -T image/WiresharkDoc-256.png $(DESTDIR)/$(datarootdir)/icons/gnome/256x256/mimetypes/application-wireshark-doc.png - @echo "Don't forget to run \"update-desktop-database\" and \"update-mime-database $(datarootdir)/mime\"" + mkdir -p $(DESTDIR)/usr/share/{icons/gnome/{16x16,32x32,48x48,256x256}/mimetypes,mime/packages,applications} + install -m 644 -T wireshark-mime-package.xml $(DESTDIR)/usr/share/mime/packages/wireshark.xml + if test x$(DESKTOP_FILE_INSTALL) != x ; then \ + $(DESKTOP_FILE_INSTALL) --dir $(DESTDIR)/usr/share/applications wireshark.desktop; \ + else \ + install -m 644 -T wireshark.desktop $(DESTDIR)/usr/share/applications/wireshark.desktop; \ + fi + mkdir -p $(DESTDIR)/usr/share/icons/hicolor/{16x16,32x32,48x48,64x64,256x256}/apps + install -m 644 image/wsicon16.png $(DESTDIR)/usr/share/icons/hicolor/16x16/apps/wireshark.png + install -m 644 image/wsicon32.png $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/wireshark.png + install -m 644 image/wsicon48.png $(DESTDIR)/usr/share/icons/hicolor/48x48/apps/wireshark.png + install -m 644 image/wsicon64.png $(DESTDIR)/usr/share/icons/hicolor/64x64/apps/wireshark.png + install -m 644 image/wsicon256.png $(DESTDIR)/usr/share/icons/hicolor/256x256/apps/wireshark.png + install -m 644 -T image/WiresharkDoc-16.png $(DESTDIR)/usr/share/icons/gnome/16x16/mimetypes/application-wireshark-doc.png + install -m 644 -T image/WiresharkDoc-32.png $(DESTDIR)/usr/share/icons/gnome/32x32/mimetypes/application-wireshark-doc.png + install -m 644 -T image/WiresharkDoc-48.png $(DESTDIR)/usr/share/icons/gnome/48x48/mimetypes/application-wireshark-doc.png + install -m 644 -T image/WiresharkDoc-256.png $(DESTDIR)/usr/share/icons/gnome/256x256/mimetypes/application-wireshark-doc.png + @echo "Don't forget to run \"update-desktop-database\" and \"update-mime-database /usr/share/mime\"" srpm-package: dist if test x$(HAVE_RPM) = xyes ; then \ |