diff options
| -rw-r--r-- | config/grc_grc.m4 | 2 | ||||
| -rw-r--r-- | grc/Makefile.am | 3 | ||||
| -rw-r--r-- | grc/freedesktop/Makefile.am | 38 |
3 files changed, 21 insertions, 22 deletions
diff --git a/config/grc_grc.m4 b/config/grc_grc.m4 index f82c55585..f02923f16 100644 --- a/config/grc_grc.m4 +++ b/config/grc_grc.m4 @@ -22,6 +22,8 @@ AC_DEFUN([GRC_GRC],[ GRC_CHECK_DEPENDENCY(grc, gr-wxgui) + AC_CHECK_PROG(XDG_UTILS,xdg-mime,freedesktop,) + dnl ######################################## dnl # test python dependencies dnl ######################################## diff --git a/grc/Makefile.am b/grc/Makefile.am index 104ff186b..8b77fc31a 100644 --- a/grc/Makefile.am +++ b/grc/Makefile.am @@ -21,9 +21,8 @@ include $(top_srcdir)/grc/Makefile.inc -SUBDIRS = \ +SUBDIRS = $(XDG_UTILS) \ data \ examples \ - freedesktop \ scripts \ src diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am index dbbf94ce4..30073b951 100644 --- a/grc/freedesktop/Makefile.am +++ b/grc/freedesktop/Makefile.am @@ -24,28 +24,26 @@ include $(top_srcdir)/grc/Makefile.inc sizes = 32 48 64 128 256 install-data-local: - if test -s "`which xdg-mime`"; then \ - for size in $(sizes); do \ - xdg-icon-resource install --context mimetypes --theme gnome --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png application-gnuradio-grc; \ - xdg-icon-resource install --context mimetypes --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png application-gnuradio-grc; \ - xdg-icon-resource install --context apps --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png gnuradio-grc; \ - done; \ - xdg-mime install --mode system $(srcdir)/gnuradio-grc.xml; \ - xdg-desktop-menu install --mode system $(srcdir)/gnuradio-grc.desktop; \ - xdg-desktop-menu install --mode system $(srcdir)/gnuradio-usrp_diagnostics.desktop; \ - fi + for size in $(sizes); do \ + xdg-icon-resource install --context mimetypes --theme gnome --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png application-gnuradio-grc; \ + xdg-icon-resource install --context mimetypes --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png application-gnuradio-grc; \ + xdg-icon-resource install --context apps --theme gnome --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png gnuradio-grc; \ + xdg-icon-resource install --context apps --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png gnuradio-grc; \ + done + xdg-mime install --mode system $(srcdir)/gnuradio-grc.xml + xdg-desktop-menu install --mode system $(srcdir)/gnuradio-grc.desktop + xdg-desktop-menu install --mode system $(srcdir)/gnuradio-usrp_diagnostics.desktop uninstall-local: - if test -s "`which xdg-mime`"; then \ - for size in $(sizes); do \ - xdg-icon-resource uninstall --context mimetypes --theme gnome --mode system --size $${size} application-gnuradio-grc; \ - xdg-icon-resource uninstall --context mimetypes --mode system --size $${size} application-gnuradio-grc; \ - xdg-icon-resource uninstall --context apps --mode system --size $${size} gnuradio-grc; \ - done; \ - xdg-mime uninstall --mode system $(srcdir)/gnuradio-grc.xml; \ - xdg-desktop-menu uninstall --mode system $(srcdir)/gnuradio-grc.desktop; \ - xdg-desktop-menu uninstall --mode system $(srcdir)/gnuradio-usrp_diagnostics.desktop; \ - fi + for size in $(sizes); do \ + xdg-icon-resource uninstall --context mimetypes --theme gnome --mode system --size $${size} application-gnuradio-grc; \ + xdg-icon-resource uninstall --context mimetypes --mode system --size $${size} application-gnuradio-grc; \ + xdg-icon-resource uninstall --context apps --theme gnome --mode system --size $${size} gnuradio-grc; \ + xdg-icon-resource uninstall --context apps --mode system --size $${size} gnuradio-grc; \ + done + xdg-mime uninstall --mode system $(srcdir)/gnuradio-grc.xml + xdg-desktop-menu uninstall --mode system $(srcdir)/gnuradio-grc.desktop + xdg-desktop-menu uninstall --mode system $(srcdir)/gnuradio-usrp_diagnostics.desktop EXTRA_DIST = \ $(srcdir)/grc-icon-256.png \ |