[Commit-gnuradio] r9684 - in gnuradio/trunk: config grc grc/freedesktop

[jblum]

Author: jblum
Date: 2008-09-30 13:43:04 -0600 (Tue, 30 Sep 2008)
New Revision: 9684

Modified:
   gnuradio/trunk/config/grc_grc.m4
   gnuradio/trunk/grc/Makefile.am
   gnuradio/trunk/grc/freedesktop/Makefile.am
Log:
AC check for xdg utils

Modified: gnuradio/trunk/config/grc_grc.m4
===================================================================
--- gnuradio/trunk/config/grc_grc.m4    2008-09-30 17:53:12 UTC (rev 9683)
+++ gnuradio/trunk/config/grc_grc.m4    2008-09-30 19:43:04 UTC (rev 9684)
@@ -22,6 +22,8 @@
 
     GRC_CHECK_DEPENDENCY(grc, gr-wxgui)
 
+    AC_CHECK_PROG(XDG_UTILS,xdg-mime,freedesktop,)
+
     dnl ########################################
     dnl # test python dependencies
     dnl ########################################

Modified: gnuradio/trunk/grc/Makefile.am
===================================================================
--- gnuradio/trunk/grc/Makefile.am      2008-09-30 17:53:12 UTC (rev 9683)
+++ gnuradio/trunk/grc/Makefile.am      2008-09-30 19:43:04 UTC (rev 9684)
@@ -21,9 +21,8 @@
 
 include $(top_srcdir)/grc/Makefile.inc
 
-SUBDIRS = \
+SUBDIRS = $(XDG_UTILS) \
        data \
        examples \
-       freedesktop \
        scripts \
        src

Modified: gnuradio/trunk/grc/freedesktop/Makefile.am
===================================================================
--- gnuradio/trunk/grc/freedesktop/Makefile.am  2008-09-30 17:53:12 UTC (rev 
9683)
+++ gnuradio/trunk/grc/freedesktop/Makefile.am  2008-09-30 19:43:04 UTC (rev 
9684)
@@ -24,28 +24,26 @@
 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 \